Build fixes for W32

author: Werner Koch <[email protected]> 2007-06-15 14:27:31 +0000
committer: Werner Koch <[email protected]> 2007-06-15 14:27:31 +0000
commit: 915b7b21fdb2d84ef55542681f418690dd8832db (patch)
tree: 43c4b7465e0120d6b63591b0c61b3338030f65f7
parent: 2007-06-15 Marcus Brinkmann <[email protected]> (diff)
download: gnupg-915b7b21fdb2d84ef55542681f418690dd8832db.tar.gz
gnupg-915b7b21fdb2d84ef55542681f418690dd8832db.zip
35 files changed, 9650 insertions, 9445 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ab8d8e72..fc34a1938 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-15  Werner Koch  <[email protected]>
+
+	* configure.ac (W32SOCKLIBS): New.
+
+	* autogen.sh: Use = and not == in test to be POSIXly correct.
+	<build-w32>: Disable use of regex.
+
 2007-06-14  Werner Koch  <[email protected]>
 
 	* configure.ac [AH_BOTTOM]: Remove the hardwired names of modules.
diff --git a/TODO b/TODO
index f9eb9bdfd..698cec446 100644
--- a/TODO
+++ b/TODO
@@ -71,10 +71,14 @@
 
 ** Add a test to check the extkeyusage.
 
-* Windows port
+* Windows port (W32)
 ** Signals are not support 
     This means we can't reread a configuration
 ** No card status notifications.
+** Regex support is disabled
+  We need to adjust the test to find the regex we have anyway in 
+  gpg4in.  Is that regex compatible to the OpenPGP requirement?
+
 
 * sm/
 ** check that we issue NO_SECKEY xxx if a -u key was not found
@@ -127,4 +131,3 @@
 ** Migrate OpenPGP keys to another system
 
 
-
diff --git a/autogen.sh b/autogen.sh
index 0470ad0d2..70b2eabb7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -40,7 +40,7 @@ MSGMERGE=${GETTEXT_PREFIX}${MSGMERGE:-msgmerge}${GETTEXT_SUFFIX}
 
 DIE=no
 FORCE=
-if test "$1" == "--force"; then
+if test x"$1" = x"--force"; then
   FORCE=" --force"
   shift
 fi
@@ -92,7 +92,8 @@ if test "$1" = "--build-w32"; then
 	     --with-libassuan-prefix=${w32root} \
 	     --with-zlib=${w32root} \
              --with-pth-prefix=${w32root} \
-             --without-included-gettext
+             --without-included-gettext \
+             --disable-regex
     rc=$?
     exit $rc
 fi
diff --git a/configure.ac b/configure.ac
index d0c318a87..9da692153 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1152,13 +1152,17 @@ AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
 GNUPG_CHECK_GNUMAKE
 
 # Add some extra libs here so that previous tests don't fail for
-# mysterious reasons - the final link step should bail out. 
+# mysterious reasons - the final link step should bail out.
+# W32SOCKLIBS is also defined so that if can be used for tools not
+# requiring any network stuff but linking to code in libcommon which
+# tracks in winsock stuff (e.g. init_common_subsystems.
 if test "$have_w32_system" = yes; then
-   NETLIBS="${NETLIBS} -lwsock32"
+   W32SOCKLIBS="-lwsock32"
+   NETLIBS="${NETLIBS} ${W32SOCKLIBS}"
 fi
 
 AC_SUBST(NETLIBS)
-
+AC_SUBST(W32SOCKLIBS)
 
 #
 # Setup gcc specific options
diff --git a/kbx/ChangeLog b/kbx/ChangeLog
index 4631ffe6a..e7c7b9afd 100644
--- a/kbx/ChangeLog
+++ b/kbx/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-15  Werner Koch  <[email protected]>
+
+	* Makefile.am (kbxutil_LDADD): Add W32SOCKLIBS.
+
 2007-06-12  Werner Koch  <[email protected]>
 
 	* kbxutil.c (main): Replace some calls by init_common_subsystems.
diff --git a/kbx/Makefile.am b/kbx/Makefile.am
index 3b5de70d1..8a07df398 100644
--- a/kbx/Makefile.am
+++ b/kbx/Makefile.am
@@ -44,10 +44,12 @@ common_sources = \
 
 libkeybox_a_SOURCES = $(common_sources)
 
-# Note that libcommon is only required to resolve the LIBOBJS.
+# We need W32SOCKLIBS because the init subsystem code in libcommon
+# requires it - although we don't actually need it.  It is easier
+# to do it this way.
 kbxutil_SOURCES = kbxutil.c $(common_sources)
 kbxutil_LDADD   = ../jnlib/libjnlib.a ../gl/libgnu.a ../common/libcommon.a \
                   $(KSBA_LIBS) $(LIBGCRYPT_LIBS) \
-                  $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)
+                  $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS)
 
 $(PROGRAMS) : ../jnlib/libjnlib.a ../gl/libgnu.a ../common/libcommon.a
diff --git a/po/be.po b/po/be.po
index 4527c87f2..1e62e1b1a 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+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"
@@ -15,57 +15,57 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 #, fuzzy
 msgid "PIN too long"
 msgstr "пароль занадта доўгі\n"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "пароль занадта доўгі\n"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 msgid "Invalid characters in PIN"
 msgstr ""
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 #, fuzzy
 msgid "Bad PIN"
 msgstr "дрэнны MPI"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "дрэнны пароль"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 #, fuzzy
 msgid "Passphrase"
 msgstr "дрэнны пароль"
@@ -75,7 +75,7 @@ msgstr "дрэнны пароль"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
@@ -84,12 +84,12 @@ msgstr ""
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr ""
@@ -188,13 +188,13 @@ msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "Увядзіце пароль\n"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr ""
 
@@ -203,7 +203,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "Паўтарыце пароль\n"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -214,238 +214,238 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "шматслоўнасьць"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "працаваць менш шматслоўна"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 msgid "|FILE|read options from FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 msgid "use a log file for the server"
 msgstr ""
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "do not use the SCdaemon"
 msgstr ""
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "Паўтарыце пароль\n"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Калі ласка, паведамляйце пра памылкі на <[email protected]>.\n"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: тэчка створана\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: agent/gpg-agent.c:1359
+#: agent/gpg-agent.c:1358
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1461
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1466
+#: agent/gpg-agent.c:1465
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483
+#: agent/gpg-agent.c:1482
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1488
+#: agent/gpg-agent.c:1487
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, c-format
 msgid "%s %s stopped\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr ""
@@ -472,77 +472,77 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 #, fuzzy
 msgid "Passphrase:"
 msgstr "дрэнны пароль"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr ""
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 #, fuzzy
 msgid "cancelled\n"
 msgstr "скасавана карыстальнікам\n"
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "памылка чытаньня файла"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -555,7 +555,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -565,7 +565,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr ""
 
@@ -577,19 +577,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 #, fuzzy
 msgid "Yes"
 msgstr "yes [так]"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr ""
 
@@ -633,43 +633,43 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 #, fuzzy
 msgid "host not found"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr ""
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "скасавана карыстальнікам\n"
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 msgid "problem with the agent\n"
 msgstr ""
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr ""
@@ -840,11 +840,11 @@ msgstr ""
 msgid "not human readable"
 msgstr ""
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1153,7 +1153,7 @@ msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
@@ -1698,536 +1698,531 @@ msgstr ""
 msgid "Compression: "
 msgstr ""
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 msgid "show the keyring name in key listings"
 msgstr ""
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/gpg.c:2266
-#, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr ""
-
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 msgid "invalid import options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 msgid "invalid export options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2582
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2804
+#: g10/gpg.c:2781
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "запіс у stdout\n"
 
-#: g10/gpg.c:2938
+#: g10/gpg.c:2915
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2921
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:2927
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2963
+#: g10/gpg.c:2940
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3041
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3066
+#: g10/gpg.c:3043
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3045
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3047
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3050
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3054
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3061
 msgid "invalid default preferences\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3186
+#: g10/gpg.c:3163
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3191
+#: g10/gpg.c:3168
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3294
+#: g10/gpg.c:3271
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [назва_файла]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва_файла]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва_файла]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3329
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [назва_файла]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3380
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3400
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва_файла]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва_файла]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва_файла]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [загады]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3556
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[назва_файла]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4184
+#: g10/gpg.c:4161
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4217
+#: g10/gpg.c:4194
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
 
@@ -4886,96 +4881,96 @@ msgstr ""
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr ""
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr ""
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr ""
 "па больш падрабязныя зьвесткі шукайце на http://www.gnupg.org/faq.html\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr ""
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 msgid "Uncompressed"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr ""
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "невядомая вэрсыя"
@@ -5032,12 +5027,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, c-format
 msgid " (main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5048,24 +5043,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-бітавы %s ключ, ID %08lX, створаны %s%s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 msgid "Repeat passphrase\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 msgid "Enter passphrase\n"
 msgstr "Увядзіце пароль\n"
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr "скасавана карыстальнікам\n"
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5075,12 +5070,12 @@ msgstr ""
 "Вам неабходна ўвесьці пароль, каб адчыніць сакрэтны ключ для\n"
 "карыстальніка: \""
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5391,28 +5386,28 @@ msgstr "паказаць сьпіс ключоў і ID карыстальнік�
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr "Калі ласка, задайце назву файла даньняў: "
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr "чытаецца stdin ...\n"
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
@@ -5660,12 +5655,12 @@ msgstr ""
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
@@ -6131,17 +6126,29 @@ msgstr "немагчыма адкрыць %s: %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr ""
+"па больш падрабязныя зьвесткі шукайце на http://www.gnupg.org/faq.html\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
@@ -6407,16 +6414,16 @@ msgid ""
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6621,7 +6628,7 @@ msgstr ""
 msgid "[Error - invalid DN]"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -6947,39 +6954,39 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 msgid "key generation is not available from the commandline\n"
 msgstr ""
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, fuzzy, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
@@ -7002,7 +7009,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
@@ -7075,7 +7082,7 @@ msgstr "паказаць ключы й адбіткі пальцаў"
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7086,13 +7093,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7164,127 +7171,127 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "пароль занадта доўгі\n"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr ""
 
@@ -7324,21 +7331,21 @@ msgid ""
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 #, fuzzy
 msgid "Component not found"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 #, fuzzy
 msgid "No argument allowed"
 msgstr "сакрэтны ключ недаступны"
@@ -7396,118 +7403,118 @@ msgid ""
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 msgid "no --program option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr ""
 
@@ -7591,10 +7598,6 @@ msgstr "непадтрымліваецца"
 #~ 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"
 
diff --git a/po/ca.po b/po/ca.po
index 1ef601b3a..969a60de3 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+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"
@@ -35,59 +35,59 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 #, fuzzy
 msgid "PIN too long"
 msgstr "la línia és massa llarga\n"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "la contrasenya és massa llarga\n"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 #, fuzzy
 msgid "Bad PIN"
 msgstr "l'MPI és erroni"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "la contrasenya és errònia"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 #, fuzzy
 msgid "Passphrase"
 msgstr "la contrasenya és errònia"
@@ -97,7 +97,7 @@ msgstr "la contrasenya és errònia"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
@@ -106,12 +106,12 @@ msgstr "no s'ha pogut crear «%s»: %s\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
@@ -213,13 +213,13 @@ msgstr ""
 "Cal una contrasenya per a protegir la clau secreta.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr ""
 
@@ -228,7 +228,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -239,244 +239,244 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 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:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "detall"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "una mica més silenciós"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cerca claus en un servidor de claus"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 #, 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:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualitza la base de dades de confiança"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Si us plau, informeu sobre els errors a <[email protected]>.\n"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 #, 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:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, 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:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: s'ha creat el directori\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, 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:1359
+#: agent/gpg-agent.c:1358
 #, 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:1461
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1466
+#: agent/gpg-agent.c:1465
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483
+#: agent/gpg-agent.c:1482
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1488
+#: agent/gpg-agent.c:1487
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, 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:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu claus es descarta\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
 
-#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
@@ -503,81 +503,81 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 #, fuzzy
 msgid "Passphrase:"
 msgstr "la contrasenya és errònia"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancel·la"
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
 # Parts?  Peces?  ivb
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "parts de la clau secreta no estan disponbles\n"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "error de lectura: %s\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -590,7 +590,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -600,7 +600,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr ""
 
@@ -612,19 +612,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 #, fuzzy
 msgid "Yes"
 msgstr "sí|si"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr ""
 
@@ -668,46 +668,46 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 #, fuzzy
 msgid "host not found"
 msgstr "%s: no s'ha trobat l'usuari\n"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no s'ha pogut connectar amb «%s»: %s\n"
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr "hi ha un problema de comunicació amb el gpg-agent\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "s'ha cancel·lat per l'usuari\n"
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
 
 # bolcats de memòria?  ivb
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no s'han pogut desactivar els bolcats de memòria: %s\n"
@@ -889,11 +889,11 @@ msgstr "AVÍS: s'hi han trobat dades de notació invàlides\n"
 msgid "not human readable"
 msgstr "no llegible per humans"
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1212,7 +1212,7 @@ msgstr "L'ordre no és vàlida (proveu «help»)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no s'ha pogut obrir «%s»\n"
@@ -1797,556 +1797,550 @@ msgstr "Dispersió: "
 msgid "Compression: "
 msgstr "Compressió: "
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no s'ha trobat cap signe = a la definició de grup «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra en quin anell de claus està una clau llistada"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s no és per a ús normal!\n"
 
-#: g10/gpg.c:2266
-#, fuzzy, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr ""
-"la extensió de xifrat «%s» no s'ha carregat per tindre permissos insegurs\n"
-
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, 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:2515
+#: g10/gpg.c:2492
 #, 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:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 #, 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:2550
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 msgid "invalid import options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 msgid "invalid export options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 #, 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:2605
+#: g10/gpg.c:2582
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 #, 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:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, 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:2804
+#: g10/gpg.c:2781
 #, 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:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 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:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVÍS: %s té preferència sobre %s\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no té sentit amb %s!\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, 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:2938
+#: g10/gpg.c:2915
 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:2944
+#: g10/gpg.c:2921
 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:2950
+#: g10/gpg.c:2927
 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:2963
+#: g10/gpg.c:2940
 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:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3041
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/gpg.c:3066
+#: g10/gpg.c:3043
 #, 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:3068
+#: g10/gpg.c:3045
 #, 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:3070
+#: g10/gpg.c:3047
 #, 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:3073
+#: g10/gpg.c:3050
 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:3077
+#: g10/gpg.c:3054
 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:3084
+#: g10/gpg.c:3061
 msgid "invalid default preferences\n"
 msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 msgid "invalid personal cipher preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 msgid "invalid personal digest preferences\n"
 msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 msgid "invalid personal compress preferences\n"
 msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, 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:3186
+#: g10/gpg.c:3163
 #, 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:3191
+#: g10/gpg.c:3168
 #, 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:3283
+#: g10/gpg.c:3260
 #, 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:3294
+#: g10/gpg.c:3271
 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:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3329
 #, 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:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3380
 #, 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:3423
+#: g10/gpg.c:3400
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3556
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 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:4184
+#: g10/gpg.c:4161
 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:4217
+#: g10/gpg.c:4194
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
@@ -5319,71 +5313,71 @@ msgstr "signatura de l'estil antic (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "s'ha detectat un paquet arrel invàlid en proc_tree()\n"
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "ha fallat l'actualització de la base de dades de confiança: %s\n"
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "no es pot treballar amb l'algoritme de clau pública %d\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "l'algoritme de xifratge no és implementat"
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "el mòdul de xifratge IDEA no està present\n"
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostra més informació\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: l'opció «%s» està desaconsellada.\n"
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "si us plau, utilitzeu «%s%s» en el seu lloc\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
@@ -5391,7 +5385,7 @@ msgstr "AVÍS: %s és una opció desaconsellada.\n"
 # Gènere?  Nombre?  Passat, futur?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: g10/misc.c:813
+#: g10/misc.c:812
 msgid "Uncompressed"
 msgstr "No comprimit"
 
@@ -5399,22 +5393,22 @@ msgstr "No comprimit"
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "No comprimit"
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "aquest missatge pot no ser usable per %s\n"
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
@@ -5474,7 +5468,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquet de tipus %d té el bit crític activat\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID de la clau principal %08lX)"
@@ -5490,7 +5484,7 @@ msgstr " (ID de la clau principal %08lX)"
 # Se't passava l'argument «*».  printf(3), hieroglyph(7).  ivb
 # Ah!  Prova-ho, no casque alguna cosa :P  ivb
 # Ah, ja veig! Moltes gràcies! Aquest msgstr ha quedat curiós :) jm
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5501,24 +5495,24 @@ msgstr ""
 "«%2$.*1$s»\n"
 "clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 msgid "Repeat passphrase\n"
 msgstr "Repetiu la contrasenya\n"
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 msgid "Enter passphrase\n"
 msgstr "Introduïu la contrasenya\n"
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr "s'ha cancel·lat per l'usuari\n"
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5528,12 +5522,12 @@ msgstr ""
 "Necessiteu la contrasenya per desblocar la clau secreta de\n"
 "l'usuari: \""
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s"
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5878,28 +5872,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:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr "Signatura separada.\n"
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr "Introduïu el nom del fitxer de dades: "
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr "s'està llegint d'stdin...\n"
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr "no hi ha dades signades\n"
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "no s'han pogut obrir les dades signades `%s'\n"
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "no s'han pogut obrir les dades signades `%s'\n"
@@ -6173,13 +6167,13 @@ msgstr ""
 "es supossa una signatura incorrecta de la clau %08lX a causa d'un bit crític "
 "desconegut\n"
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "clau %08lX: no hi ha una subclau per al paquet de la subclau de revocació\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
@@ -6690,17 +6684,29 @@ msgstr "no s'ha pogut obrir «%s»: %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "heu trobat un bug... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "error en la lectura de «%s»: %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr ""
+"si us plau, visiteu http://www.gnupg.org/faq.html per a més informació\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "no es pot obrir el fitxer: %s\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
@@ -6969,16 +6975,16 @@ msgid ""
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7206,7 +7212,7 @@ msgstr "error: l'empremta digital és invàlida\n"
 # Se't passava l'argument «*».  printf(3), hieroglyph(7).  ivb
 # Ah!  Prova-ho, no casque alguna cosa :P  ivb
 # Ah, ja veig! Moltes gràcies! Aquest msgstr ha quedat curiós :) jm
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7529,41 +7535,41 @@ msgstr ""
 "signa, comprova, xifra o desxifra\n"
 "l'operació predeterminada depén de les dades introduïdes\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "no s'ha pogut connectar amb «%s»: %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
 # No em passe! ;)  ivb
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 #, fuzzy
 msgid "key generation is not available from the commandline\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, fuzzy, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
@@ -7587,7 +7593,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -7660,7 +7666,7 @@ msgstr "error: l'empremta digital és invàlida\n"
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7671,13 +7677,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7750,128 +7756,128 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "la línia és massa llarga\n"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOM|usa l'algoritme de xifratge NOM per a les contrasenyes"
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr ""
 
@@ -7911,21 +7917,21 @@ msgid ""
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 #, fuzzy
 msgid "Component not found"
 msgstr "no s'ha trobat la clau pública"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 msgid "No argument allowed"
 msgstr ""
 
@@ -7983,120 +7989,120 @@ msgid ""
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "ha fallat l'actualització de la base de dades de confiança: %s\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "no s'ha pogut obrir %s: %s\n"
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
 # Execució de programes remots, o execució remota de programes? jm
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "no hi ha suport per a l'execució remota de programes\n"
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, fuzzy, c-format
 msgid "could not fork: %s\n"
 msgstr "%s: no s'ha trobat l'usuari: %s\n"
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "%s: no s'ha creat l'anell: %s\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr ""
 
@@ -8105,6 +8111,12 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
+#, fuzzy
+#~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
+#~ msgstr ""
+#~ "la extensió de xifrat «%s» no s'ha carregat per tindre permissos "
+#~ "insegurs\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA requereix l'ús d'un algoritme de dispersió de 160 bits\n"
 
@@ -8404,10 +8416,6 @@ msgstr "l'algoritme de protecció %d%s no està suportat\n"
 #~ msgid "WARNING: using insecure memory!\n"
 #~ msgstr "AVÍS: esteu usant memòria insegura!\n"
 
-#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
-#~ msgstr ""
-#~ "si us plau, visiteu http://www.gnupg.org/faq.html per a més informació\n"
-
 # Últimament pense si «iniciar» no serà millor que «inicialitzar»?  ivb
 # Segons SC, hi ha diferència. jm
 #~ msgid "operation is not possible without initialized secure memory\n"
diff --git a/po/cs.po b/po/cs.po
index 9a7c88919..e1b59ce3a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+0200\n"
 "PO-Revision-Date: 2004-11-26 09:12+0200\n"
 "Last-Translator: Roman Pavlik <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
@@ -15,59 +15,59 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "ulo�en� fingerprintu se nezda�ilo: %s\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 #, fuzzy
 msgid "PIN too long"
 msgstr "��dek je p��li� dlouh�"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "��dek je p��li� dlouh�"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Neplatn� znak ve jm�n�\n"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 #, fuzzy
 msgid "Bad PIN"
 msgstr "�patn� MPI"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "�patn� heslo"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 #, fuzzy
 msgid "Passphrase"
 msgstr "�patn� heslo"
@@ -77,7 +77,7 @@ msgstr "�patn� heslo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ochrann� algoritmus %d nen� podporov�n\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
@@ -86,12 +86,12 @@ msgstr "nemohu vytvo�it `%s': %s\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
@@ -190,13 +190,13 @@ msgstr ""
 "Pro ochranu Va�eho tajn�ho kl��e mus�te zadat heslo.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "zm�nit heslo"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "zm�nit heslo"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -216,104 +216,104 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "s dodate�n�mi informacemi"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "b�t o trochu v�c tich�"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "vyhledat kl��e na serveru kl���"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "nastavit sadu preferenc� pro vybran� u�ivatelsk� ID"
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualizovat datab�zi d�v�ry"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 #, fuzzy
@@ -322,138 +322,138 @@ msgstr ""
 "Chyby oznamte, pros�m, na adresu <[email protected]>.\n"
 "P�ipom�nky k p�ekladu <[email protected]>.\n"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, 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:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "chyba p�i vytv��en� `%s': %s\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nemohu vytvo�it adres�� `%s': %s\n"
 
-#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "chyba p�i hled�n� z�znamu d�v�ryhodnosti v `%s': %s\n"
 
-#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "adres�� `%s' vytvo�en\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) selhal v %s: %s\n"
 
-#: agent/gpg-agent.c:1359
+#: agent/gpg-agent.c:1358
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "nemohu vytvo�it adres�� `%s': %s\n"
 
-#: agent/gpg-agent.c:1461
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1466
+#: agent/gpg-agent.c:1465
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483
+#: agent/gpg-agent.c:1482
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1488
+#: agent/gpg-agent.c:1487
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
 
-#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: p�esko�eno: %s\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "�patn� form�t prom�nn� prost�ed� GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verze %d nen� podporov�n\n"
@@ -480,80 +480,80 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 #, fuzzy
 msgid "Passphrase:"
 msgstr "�patn� heslo"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 #, fuzzy
 msgid "cancelled\n"
 msgstr "zru�eno"
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "chyba v `%s': %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "tajn� ��sti kl��e nejsou dostupn�\n"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "chyba p�i �ten� v `%s': %s\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -566,7 +566,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -576,7 +576,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr ""
 
@@ -588,19 +588,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 #, fuzzy
 msgid "Yes"
 msgstr "ano"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr ""
 
@@ -644,44 +644,44 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "chyba p�i vytv��en� `%s': %s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 #, fuzzy
 msgid "host not found"
 msgstr "[ID u�ivatele nenalezeno]"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nemohu se p�ipojit k `%s': %s\n"
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "zru�eno u�ivatelem\n"
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "probl�m s agentem - pou��v�n� agenta vypnuto\n"
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nemohu vypnout vytv��en� core soubor�: %s\n"
@@ -855,11 +855,11 @@ msgstr "VAROV�N�: nalezen neplatn� form�t z�pisu data\n"
 msgid "not human readable"
 msgstr "nen� v p��mo �iteln�m form�tu"
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1151,7 +1151,7 @@ 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:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nelze otev��t `%s'\n"
@@ -1708,63 +1708,63 @@ msgstr "Hash: "
 msgid "Compression: "
 msgstr "Komprese: "
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "konfliktn� p��kazy\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = podpis nalezen v definici skupiny `%s'\n"
 
 # g10/g10.c:1179#, c-format
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� domovsk�ho adres��e nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� konfigura�n�ho souboru nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� roz�i�uj�c�ho modulu nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va pro domovsk� adres��e nejsou bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va pro konfigura�n� soubor nejsou bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROV�N�: p��stupov� pr�va roz�i�uj�c�mu modulu nejsou bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� adres��e s domovk�m adres��em nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1772,21 +1772,21 @@ msgstr ""
 "VAROV�N�: vlastnictv� adres��e s konfigura�n�m souborem nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� adres��e s roz�i�uj�c�m modulem nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va k adres��i s domovsk�m adres��em nejsou nastavena "
 "bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1794,7 +1794,7 @@ msgstr ""
 "VAROV�N�: p��stupov� pr�va k aders��i s konfigura�n�m souborem nejsou "
 "nastavena bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
@@ -1802,470 +1802,463 @@ msgstr ""
 "nastavena bezpe�n� `%s'\n"
 
 # c-format
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "p�epnout mezi vypisem seznamu tajn�ch a ve�ejn�ch kl���"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZN�MKA: star� implicitn� soubor s mo�nostmi `%s ignorov�n'\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, 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:2266
-#, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr ""
-"�ifra `%s' nebyla nahr�na, proto�e p��stupov� pr�va nejsou nastavena "
-"bezpe�n�\n"
-
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2492
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nen� platn� znakov� sada\n"
 
-#: g10/gpg.c:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru kl���\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2527
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2530
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 msgid "invalid import options\n"
 msgstr "neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 msgid "invalid export options\n"
 msgstr "neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 msgid "invalid list options\n"
 msgstr "neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2582
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 msgid "invalid verify options\n"
 msgstr "neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/gpg.c:2804
+#: g10/gpg.c:2781
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s p�ep��e %s\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nen� dovoleno pou��vat %s s %s!\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�v� s %s smysl!\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, 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:2938
+#: g10/gpg.c:2915
 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:2944
+#: g10/gpg.c:2921
 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:2950
+#: g10/gpg.c:2927
 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:2963
+#: g10/gpg.c:2940
 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:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� komprimovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 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:3064
+#: g10/gpg.c:3041
 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:3066
+#: g10/gpg.c:3043
 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:3068
+#: g10/gpg.c:3045
 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:3070
+#: g10/gpg.c:3047
 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:3073
+#: g10/gpg.c:3050
 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:3077
+#: g10/gpg.c:3054
 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:3084
+#: g10/gpg.c:3061
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� p�edvolby\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro �ifrov�n�\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro hashov�n�\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro komprimaci\n"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud nen� funk�n� s %s\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, 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:3186
+#: g10/gpg.c:3163
 #, 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:3191
+#: g10/gpg.c:3168
 #, 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:3283
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 
-#: g10/gpg.c:3294
+#: g10/gpg.c:3271
 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:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [jm�no souboru]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symetrick� �ifrov�n� `%s' se nepovedlo: %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 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:3352
+#: g10/gpg.c:3329
 #, 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:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [jm�no souboru]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 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:3403
+#: g10/gpg.c:3380
 #, 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:3423
+#: g10/gpg.c:3400
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jm�no souboru]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jm�no souboru]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key id u�ivatele"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u�ivatele"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u�ivatele [p��kazy]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3556
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export kl��e se nepoda�il: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hled�n� na keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh dat na keyserveru se nezda�il: %s\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[jm�no souboru]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�n�te ps�t svou zpr�vu ...\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pro certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4184
+#: g10/gpg.c:4161
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
 
-#: g10/gpg.c:4217
+#: g10/gpg.c:4194
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
@@ -5099,95 +5092,95 @@ msgstr "podpis star�ho typu (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nalezen neplatn� ko�enov� paket v proc_tree()\n"
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat `%s' selhal na %s: %s\n"
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) selhal v %s: %s\n"
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "VAROV�N�: pou��v�m experiment�ln� algoritmus ve�ejn�ho kl��e %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "VAROV�N�: pou��v�m experiment�ln� �ifrovac� algoritmus %s\n"
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "VAROV�N�: pou��v�m experiment�ln� hashovac� algoritmus %s\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "VAROV�N�: vy��dan� algoritmus %s nen� doporu�en\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA modul pro GnuPG nenalezen\n"
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "V�ce informac� naleznete na adrese http://www.gnupg.cz/faq.html\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: pou�it� parametru \"%s\" se nedoporu�uje\n"
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROV�N�: pou��v�n� parametru \"%s\" se nedoporu�uje\n"
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "pou�ijte m�sto n�j \"%s%s\" \n"
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROV�N�: pou��v�n� p��kaz \"%s\" se nedoporu�uje - nepou��vejte jej\n"
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "VAROV�N�: pou��v�n� parametru \"%s\" se nedoporu�uje\n"
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 msgid "Uncompressed"
 msgstr "Nezakomprimov�no"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 msgid "uncompressed|none"
 msgstr "nezakomprimov�no|nic"
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "tato zpr�va nemus� b�t s %s pou�iteln�\n"
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "nejednozna�n� volby `%s'\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "nezn�m� volba `%s'\n"
@@ -5243,12 +5236,12 @@ msgstr "VAROV�N�: potencion�ln� nebezpe�n� symetricky za�ifrov�n kl�� sezen�\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, c-format
 msgid " (main key ID %s)"
 msgstr "(hlavn� ID kl��e %s)"
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5259,24 +5252,24 @@ msgstr ""
 "\"%.*s\"\n"
 "Kl�� o d�lce %u bit�, typ %s, ID %s, vytvo�en� %s%s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 msgid "Repeat passphrase\n"
 msgstr "Opakovat heslo\n"
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 msgid "Enter passphrase\n"
 msgstr "Vlo�it heslo\n"
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr "zru�eno u�ivatelem\n"
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "probl�m s agentem - pou��v�n� agenta vypnuto\n"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5285,12 +5278,12 @@ msgstr ""
 "Mus�te zn�t heslo, abyste odemknul(a) tajn� kl�� pro\n"
 "u�ivatele: \"%s\"\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�lka %u bit�, typ %s, kl�� %s, vytvo�en� %s"
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (podkl�� na hlavn�m kl��i ID %s)"
@@ -5618,28 +5611,28 @@ msgstr ""
 "data nebyla ulo�ena; k jejich ulo�en� pou�ijte parametr p��kazu \"--output"
 "\"\n"
 
-#: g10/plaintext.c:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr "Podpis odd�len� od dokumentu.\n"
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr "Pros�m, vlo�te n�zev datov�ho souboru: "
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr "�tu standardn� vstup ...\n"
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr "chyb� podepsan� data\n"
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nemohu otev��t podepsan� data '%s'\n"
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "nemohu otev��t podepsan� data '%s'\n"
@@ -5902,12 +5895,12 @@ msgstr ""
 "p�edpokl�d�m �patn� podpis kl��em %s, proto�e je nastaven nezn�m� kritick� "
 "bit\n"
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "kl�� %s: neexistuje podkl�� pro revokaci podkl��e\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "kl�� %s: podkl�� kter� je sv�z�n s podpisem neexistuje\n"
@@ -6393,17 +6386,28 @@ msgstr "nemohu otev��t `%s': %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "nalezena chyba v programu ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "chyba p�i �ten� `%s': %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr "V�ce informac� naleznete na adrese http://www.gnupg.cz/faq.html\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "podeps�n� selhalo: %s\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "p�ejmenov�n� `%s' na `%s' se nezda�ilo: %s\n"
@@ -6669,16 +6673,16 @@ msgid ""
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6886,7 +6890,7 @@ msgstr ""
 msgid "[Error - invalid DN]"
 msgstr "Chyba: neplatn� odpov��.\n"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7217,40 +7221,40 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "nemohu se p�ipojit k `%s': %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 #, fuzzy
 msgid "key generation is not available from the commandline\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, fuzzy, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "Pros�m, vyberte druh kl��e, kter� chcete generovat:\n"
@@ -7274,7 +7278,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
@@ -7347,7 +7351,7 @@ msgstr "Chyba: nespr�vn� naform�tovan� fingerprint.\n"
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7358,13 +7362,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7437,127 +7441,127 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "��dek je p��li� dlouh�"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "nezn�m� volba `%s'\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "podeps�n� selhalo: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "�ten� ve�ejn�ho kl��e se nezda�ilo: %s\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "chyba p�i hled�n� z�znamu d�v�ryhodnosti v `%s': %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr ""
 
@@ -7598,21 +7602,21 @@ msgid ""
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 #, fuzzy
 msgid "Component not found"
 msgstr "ve�ejn� kl�� nenalezen"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 #, fuzzy
 msgid "No argument allowed"
 msgstr "administr�torsk� p��kazy nejsou povoleny\n"
@@ -7671,119 +7675,119 @@ msgid ""
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "Nen� dovoleno pou��vat %s s %s!\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "fstat `%s' selhal na %s: %s\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "nemohu vytvo�it adres�� `%s': %s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "chyba p�i z�pisu souboru kl��� (keyring)  `%s': %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "chyba v `%s': %s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "spu�t�n� extern�ho programu nen� podporov�no\n"
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "smaz�n� bloku kl��e se nezda�ilo:  %s\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "nemohu vytvo�it z�lohu souboru `%s': %s\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "nemohu vytvo�it z�lohu souboru `%s': %s\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr ""
 
@@ -7792,6 +7796,11 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "ochrann� algoritmus %d nen� podporov�n\n"
 
+#~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
+#~ msgstr ""
+#~ "�ifra `%s' nebyla nahr�na, proto�e p��stupov� pr�va nejsou nastavena "
+#~ "bezpe�n�\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA po�aduje pou�it� 160-ti bitov�ho hashovac�ho algoritmu\n"
 
@@ -8085,9 +8094,6 @@ msgstr "ochrann� algoritmus %d nen� podporov�n\n"
 #~ msgid "WARNING: using insecure memory!\n"
 #~ msgstr "VAROV�N�: Pou��van� pam� nen� bezpe�n�!\n"
 
-#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
-#~ msgstr "V�ce informac� naleznete na adrese http://www.gnupg.cz/faq.html\n"
-
 #~ msgid "operation is not possible without initialized secure memory\n"
 #~ msgstr "prov�st operaci nen� mo�n� bez inicializovan� bezpe�n� pam�ti\n"
 
diff --git a/po/da.po b/po/da.po
index 9738eed87..6e3c1a12b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+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"
@@ -17,56 +17,56 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 # er det klogt at overs�tte TrustDB?
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 msgid "PIN too long"
 msgstr ""
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 msgid "Passphrase too long"
 msgstr ""
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 #, fuzzy
 msgid "Bad PIN"
 msgstr "d�rlig mpi"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "d�rlig kodes�tning"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 #, fuzzy
 msgid "Passphrase"
 msgstr "d�rlig kodes�tning"
@@ -76,7 +76,7 @@ msgstr "d�rlig kodes�tning"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, fuzzy, c-format
@@ -85,12 +85,12 @@ msgstr "kan ikke oprette %s: %s\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
@@ -191,13 +191,13 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -217,241 +217,241 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "meddelsom"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "v�r mere stille"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "opdat�r tillidsdatabasen"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, fuzzy, c-format
 msgid "error creating `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: mappe oprettet\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: agent/gpg-agent.c:1359
+#: agent/gpg-agent.c:1358
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: agent/gpg-agent.c:1461
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1466
+#: agent/gpg-agent.c:1465
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483
+#: agent/gpg-agent.c:1482
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1488
+#: agent/gpg-agent.c:1487
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: udelod: %s\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
@@ -478,76 +478,76 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 #, fuzzy
 msgid "Passphrase:"
 msgstr "d�rlig kodes�tning"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 msgid "cancelled\n"
 msgstr ""
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "panser: %s\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -560,7 +560,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -570,7 +570,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr ""
 
@@ -582,19 +582,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 #, fuzzy
 msgid "Yes"
 msgstr "ja"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr ""
 
@@ -638,42 +638,42 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 #, fuzzy
 msgid "host not found"
 msgstr "%s: bruger ikke fundet\n"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 msgid "canceled by user\n"
 msgstr ""
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 msgid "problem with the agent\n"
 msgstr ""
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan ikke sl� core-dump fra: %s\n"
@@ -848,11 +848,11 @@ msgstr "ingen gyldig OpenPGP data fundet.\n"
 msgid "not human readable"
 msgstr ""
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1170,7 +1170,7 @@ msgstr ""
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
@@ -1720,554 +1720,549 @@ msgstr ""
 msgid "Compression: "
 msgstr "Kommentar: "
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/gpg.c:2266
-#, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr ""
-
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2582
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2804
+#: g10/gpg.c:2781
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/gpg.c:2938
+#: g10/gpg.c:2915
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2921
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:2927
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2963
+#: g10/gpg.c:2940
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3041
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3066
+#: g10/gpg.c:3043
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3045
 #, 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:3070
+#: g10/gpg.c:3047
 #, 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:3073
+#: g10/gpg.c:3050
 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:3077
+#: g10/gpg.c:3054
 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:3084
+#: g10/gpg.c:3061
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3186
+#: g10/gpg.c:3163
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3191
+#: g10/gpg.c:3168
 #, 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:3283
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/gpg.c:3294
+#: g10/gpg.c:3271
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3329
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3380
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3400
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3556
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4184
+#: g10/gpg.c:4161
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4217
+#: g10/gpg.c:4194
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
@@ -5001,97 +4996,97 @@ msgstr "gammeldags (PGP 2.x) signatur\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "uimplementeret cifferalgoritme"
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 #, fuzzy
 msgid "Uncompressed"
 msgstr "ikke bearbejdet"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "ikke bearbejdet"
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
@@ -5148,12 +5143,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hovedn�gle-ID %08lX)"
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5161,26 +5156,26 @@ msgid ""
 "%u-bit %s key, ID %s, created %s%s\n"
 msgstr ""
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Indtast kodes�tning: "
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5189,12 +5184,12 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr ""
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5528,28 +5523,28 @@ msgstr "n�gle %08lX: ingen bruger-id\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr ""
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr "l�ser stdin ...\n"
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
@@ -5804,12 +5799,12 @@ msgstr "Denne n�gle er ikke beskyttet.\n"
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
@@ -6277,17 +6272,28 @@ msgstr "kan ikke �bne '%s': %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du fandt en fejl ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "fejl ved l�sning af '%s': %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr "rev- forkert n�gletilbagekald\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
@@ -6558,16 +6564,16 @@ msgid ""
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6776,7 +6782,7 @@ msgstr ""
 msgid "[Error - invalid DN]"
 msgstr "fejl i trailerlinie\n"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7098,39 +7104,39 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "brug: gpg [flag] "
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 msgid "key generation is not available from the commandline\n"
 msgstr ""
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, fuzzy, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
@@ -7154,7 +7160,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
@@ -7229,7 +7235,7 @@ msgstr "fejl i trailerlinie\n"
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7240,13 +7246,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7319,129 +7325,129 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "sl� fuld fejltjekning til"
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|brug cifrealgoritme NAME for pasfrase"
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr ""
 
@@ -7481,21 +7487,21 @@ msgid ""
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "brug: gpg [flag] "
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 #, fuzzy
 msgid "Component not found"
 msgstr "offentlig n�gle ikke fundet"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 #, fuzzy
 msgid "No argument allowed"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
@@ -7553,118 +7559,118 @@ msgid ""
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 msgid "no --program option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index 23d7ff28e..7a75ae7f0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.9.90\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+0200\n"
 "PO-Revision-Date: 2007-05-09 11:14+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "Die Sperre für das Pinentry kann nicht gesetzt werden: %s\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -31,7 +31,7 @@ msgstr ""
 "Bitte geben Sie Ihre PIN ein, so daß der geheime Schlüssel benutzt werden "
 "kann"
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -39,36 +39,36 @@ msgstr ""
 "Bitte geben Sie Ihre Passphrase ein, so daß der geheime Schlüssel benutzt "
 "werden kann"
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (Versuch %d von %d)"
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 msgid "PIN too long"
 msgstr "Die PIN ist zu lang"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 msgid "Passphrase too long"
 msgstr "Das Mantra (Passphrase) ist zu lang"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 msgid "Invalid characters in PIN"
 msgstr "Ungültige Zeichen in der PIN"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr "Die PIN ist zu kurz"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 msgid "Bad PIN"
 msgstr "Falsche PIN"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 msgid "Bad Passphrase"
 msgstr "Falsche Passphrase"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 msgid "Passphrase"
 msgstr "Passphrase"
 
@@ -77,7 +77,7 @@ msgstr "Passphrase"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "SSH Schlüssel von mehr als %d Bits werden nicht unterstützt\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
@@ -86,12 +86,12 @@ msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
@@ -190,12 +190,12 @@ msgstr "Neue Passphrase eingeben"
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr "Bitte geben Sie die Passphrase ein%0Aum Ihren Schlüssel zu schützen"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 msgid "Please re-enter this passphrase"
 msgstr "Bitte geben Sie die Passphrase noch einmal ein:"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr "Keine Übereinstimmung - bitte nochmal versuchen"
 
@@ -203,7 +203,7 @@ msgstr "Keine Übereinstimmung - bitte nochmal versuchen"
 msgid "Please enter the new passphrase"
 msgstr "Bitte geben Sie die Passphrase ein:"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 msgid ""
 "@Options:\n"
@@ -212,109 +212,109 @@ msgstr ""
 "@Optionen:\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "Im Server Modus ausführen"
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "Im Daemon Modus ausführen"
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "Ausgabe für /bin/sh"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "Ausgabe für /bin/csh"
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 msgid "|FILE|read options from FILE"
 msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr "Im Vordergrund laufen lassen"
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr "Tastatur und Maus nicht \"grabben\""
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 msgid "use a log file for the server"
 msgstr "Logausgaben in eine Datei umlenken"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 msgid "use a standard location for the socket"
 msgstr "Benutze einen Standardnamen für den Socket"
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|benutze PGM as PIN-Entry"
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|benutze PGM as SCdaemon"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "do not use the SCdaemon"
 msgstr "Den Scdaemon-basierten Kartenzugriff nicht nutzen"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr "Ignoriere Anfragen, das TTY zu wechseln"
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr "Ignoriere Anfragen, das X-Display zu wechseln"
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|lasse PINs im Cache nach N Sekunden verfallen"
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr "benutze PINs im Cache nicht bem Signieren"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "erlaube Aufrufern Schlüssel als \"vertrauenswürdig\" zu markieren"
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "allow presetting passphrase"
 msgstr "erlaube ein \"preset\" von Passphrases"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr "Die ssh-agent-Emulation anschalten"
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|DATEI|Schreibe die Umgebungsvariabeln auf DATEI"
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 msgid "Please report bugs to <"
 msgstr "Fehlerberichte bitte an <"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Aufruf: gpg-agent [Optionen] (-h für Hilfe)"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -322,126 +322,126 @@ msgstr ""
 "Syntax: gpg-agent [Optionen] [Befehl [Argumente]]\n"
 "Verwaltung von geheimen Schlüsseln für GnuPG\n"
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ungültige Debugebene `%s' angegeben\n"
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, 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:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Fehler beim Erstellen von `%s': %s\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "Verzeichnis `%s' kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr "Der Name des Sockets ist zu lang\n"
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "Socket kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, 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:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "Der listen()-Aufruf ist fehlgeschlagen: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "Es wird auf Socket `%s' gehört\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "Verzeichnis `%s' erzeugt\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat()-Aufruf für `%s' fehlgeschlagen: %s\n"
 
-#: agent/gpg-agent.c:1359
+#: agent/gpg-agent.c:1358
 #, 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:1461
+#: agent/gpg-agent.c:1460
 #, 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:1466
+#: agent/gpg-agent.c:1465
 #, 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:1483
+#: agent/gpg-agent.c:1482
 #, 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:1488
+#: agent/gpg-agent.c:1487
 #, 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:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
 
-#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s angehalten\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 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:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
 
-#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "GPG-Agent-Protokoll-Version %d wird nicht unterstützt\n"
@@ -470,16 +470,16 @@ msgstr ""
 "Syntax: gpg-protect-tool [Optionen] [Argumente]\n"
 "Werkzeug zum Bearbeiten von geheimen Schlüsseln\n"
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Bitte geben Sie die Passphrase zum Entsperren des PKCS#12 Objekts ein"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 "Bitte geben Sie die Passphrase zum Schützen des neuen PKCS#12 Objekts ein"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -487,7 +487,7 @@ msgstr ""
 "Bitte geben Sie die Passphrase ein, um das importierte Objekt im GnuPG "
 "System zu schützen."
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -495,58 +495,58 @@ msgstr ""
 "Die Eingabe der Passphrase bzw. der PIN\n"
 "wird benötigt um diese Aktion auszuführen."
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "Fehler bei der Abfrage der Passphrase: %s\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 msgid "cancelled\n"
 msgstr "Vom Benutzer abgebrochen\n"
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, c-format
 msgid "error opening `%s': %s\n"
 msgstr "Fehler beim Öffnen von `%s': %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "Datei `%s', Zeile %d: %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 "Anweisung \"%s\" in `%s', Zeile %d\n"
 " ignoriert\n"
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr ""
 "Systemliste der vertrauenswürdigen Zertifikate '%s' ist nicht vorhanden\n"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "fehlerhafter Fingerabdruck in `%s', Zeile %d\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr "Ungültiger Schlüsselflag in `%s', Zeile %d\n"
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "Fehler beim Lesen von `%s', Zeile %d: %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr "Fehler beim Lesen der Liste vertrauenswürdiger root-Zertifikate\n"
 
@@ -559,7 +559,7 @@ msgstr "Fehler beim Lesen der Liste vertrauenswürdiger root-Zertifikate\n"
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -571,7 +571,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr "Korrekt"
 
@@ -583,7 +583,7 @@ msgstr "Korrekt"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -592,11 +592,11 @@ msgstr ""
 "Wenn Sie vollständiges Vertrauen haben, daß%%0A  \"%s\"%%"
 "0ABenutzerzertifikate verläßlich zertifiziert, so antworten Sie mit \"Ja\""
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr "Nein"
 
@@ -640,41 +640,41 @@ msgstr "Feler bei Ausführung von `%s': wahrscheinlich nicht installiert\n"
 msgid "error running `%s': terminated\n"
 msgstr "Fehler bei Ausführung von `%s': beendet\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, c-format
 msgid "error creating socket: %s\n"
 msgstr "Fehler beim Erstellen des Sockets: %s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 msgid "host not found"
 msgstr "Host nicht gefunden"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr "GPG-Agent ist in dieser Sitzung nicht vorhanden\n"
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr "Kommunikationsproblem mit GPG-Agent\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 msgid "problem setting the gpg-agent options\n"
 msgstr "Beim setzen der gpg-agent Optionen ist ein problem aufgetreten\n"
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 msgid "canceled by user\n"
 msgstr "Vom Benutzer abgebrochen\n"
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 msgid "problem with the agent\n"
 msgstr "Problem mit dem Agenten\n"
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "core-dump-Dateierzeugung kann nicht abgeschaltet werden: %s\n"
@@ -848,11 +848,11 @@ msgstr "WARNUNG: Ungültige \"Notation\"-Daten gefunden\n"
 msgid "not human readable"
 msgstr "nicht als Klartext darstellbar"
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr "Kein aktiver gpg-agent - es wird einer gestarted\n"
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "Verbindung zum gpg-agent nicht möglich - Ersatzmethode wird versucht\n"
 
@@ -1146,7 +1146,7 @@ msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Befehl\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht geöffnet werden\n"
@@ -1713,57 +1713,57 @@ msgstr "Hash: "
 msgid "Compression: "
 msgstr "Komprimierung: "
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Befehle\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses für Home-"
 "Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1771,20 +1771,20 @@ msgstr ""
 "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses der "
 "Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses `%s'\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses des Home-"
 "Verzeichnisses `%s'\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1792,482 +1792,475 @@ msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
 "Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses auf "
 "Erweiterung `%s'\n"
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Unbekanntes Konfigurationselement `%s'\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr "Anzeigen der Foto-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr "Zeige Richtlinien-URL während der Unterschriftenlisten"
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 msgid "show all notations during signature listings"
 msgstr "Alle Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr "Zeige IETF-Standard"
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr "Zeige anwenderseitige Notationen in den Unterschriftenlisten"
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "Der bevorzugten Schlüsselserver mit den Signaturen anlisten"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr "Zeige Gültigkeit der User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr "Zeige widerrufene und verfallene User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr "Zeige widerrufene und verfallene Unterschlüssel in den Schlüssellisten"
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 msgid "show the keyring name in key listings"
 msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 msgid "show expiration dates during signature listings"
 msgstr "Das Ablaufdatum mit den Signaturen anlisten"
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 "Die Bibliothek \"libgcrypt\" is zu alt (benötigt wird %s, vorhanden ist %s)\n"
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, 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:2266
-#, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr ""
-"Verschlüsselungserweiterung `%s' wurde wegen unsicherer Zugriffsrechte nicht "
-"geladen\n"
-
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' ist kein gültiges Unterschriftablaufdatum\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2492
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' ist kein gültiger Zeichensatz\n"
 
-#: g10/gpg.c:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 msgid "could not parse keyserver URL\n"
 msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2527
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2530
 msgid "invalid keyserver options\n"
 msgstr "Ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ungültige Import-Option\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 msgid "invalid import options\n"
 msgstr "Ungültige Import-Option\n"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ungültige Export-Option.\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 msgid "invalid export options\n"
 msgstr "Ungültige Export-Option\n"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ungültige Listen-Option.\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 msgid "invalid list options\n"
 msgstr "Ungültige Listen-Option\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr "Zeige die Foto-ID während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr "Zeige Richtlinien-URLs während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 msgid "show all notations during signature verification"
 msgstr "Alle Notationen wahrend der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr "Zeige IETF-Standard-Notationen während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr "Zeie anwenderseitige Notationen während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "Die URL für den bevorzugten Schlüsselserver während der "
 "Unterschriftenprüfung anzeigen"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2582
 msgid "show user ID validity during signature verification"
 msgstr "Die Gültigkeit der User-ID während der Unterschriftenprüfung anzeigen"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "Zeige widerrufene und verfallene User-IDs während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 msgid "show only the primary user ID in signature verification"
 msgstr "Zeige nur die Hauptuser-ID während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr "Prüfe Unterschriftengültigkeit mittels PKA-Daten"
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "werte das Vertrauen zu Unterschriften durch gültige PKA-Daten auf"
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ungültige Überprüfuns-Option.\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 msgid "invalid verify options\n"
 msgstr "Ungültige Überprüfungs-Option\n"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, 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:2804
+#: g10/gpg.c:2781
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr "ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, 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:2938
+#: g10/gpg.c:2915
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus können Sie nur abgetrennte oder Klartextunterschriften "
 "machen\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2921
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus können Sie nicht gleichzeitig unterschreiben und "
 "verschlüsseln\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:2927
 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:2963
+#: g10/gpg.c:2940
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "Verschlüssen einer Botschaft benötigt im --pgp2-Modus die IDEA-"
 "Verschlüsselung\n"
 
-#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed müssen größer als 0 sein\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3041
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed müssen größer als 1 sein\n"
 
-#: g10/gpg.c:3066
+#: g10/gpg.c:3043
 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:3068
+#: g10/gpg.c:3045
 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:3070
+#: g10/gpg.c:3047
 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:3073
+#: g10/gpg.c:3050
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3054
 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:3084
+#: g10/gpg.c:3061
 msgid "invalid default preferences\n"
 msgstr "ungültige Standard-Voreinstellungen\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 msgid "invalid personal cipher preferences\n"
 msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 msgid "invalid personal digest preferences\n"
 msgstr "ungültige private Hashvoreinstellungen\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 msgid "invalid personal compress preferences\n"
 msgstr "ungültige private Komprimierungsvoreinstellungen\n"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, 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:3186
+#: g10/gpg.c:3163
 #, 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:3191
+#: g10/gpg.c:3168
 #, 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:3283
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/gpg.c:3294
+#: g10/gpg.c:3271
 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:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [Dateiname]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 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:3352
+#: g10/gpg.c:3329
 #, 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:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 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:3403
+#: g10/gpg.c:3380
 #, 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:3423
+#: g10/gpg.c:3400
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3556
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schlüsselexport fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4184
+#: g10/gpg.c:4161
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4217
+#: g10/gpg.c:4194
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
 
@@ -5154,96 +5147,96 @@ msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ungültiges root-Paket in proc_tree() entdeckt\n"
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat von `%s' schlug fehl in %s: %s\n"
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) schlug fehl in %s: %s\n"
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "WARNUNG: Verwendung des experimentellen Public-Key-Verfahrens %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "WARNING: Verwendung des experimentellen Verschlüsselungsverfahren %s\n"
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "WARNUNG: Verwendung des experimentellen Hashverfahrens %s\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "WARNUNG: Die Verwendung des Hashverfahrens %s ist nicht ratsam\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "das IDEA-Verschlüsselungs-Plugin ist nicht vorhanden\n"
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "Siehe %s für weitere Infos\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: mißbilligte Option \"%s\".\n"
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNUNG: \"%s\" ist eine mißbilligte Option.\n"
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Bitte benutzen Sie stattdessen \"%s%s\".\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "WARNUNG: \"%s\" ist ein nicht ratsamer Befehl - verwenden Sie ihn nicht.\n"
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: Die Option \"%s\" is veraltet - sie hat keine Wirkung\n"
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "WARNUNG: \"%s\" ist eine veraltete Option - sie hat keine Wirkung.\n"
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 msgid "Uncompressed"
 msgstr "nicht komprimiert"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 msgid "uncompressed|none"
 msgstr "unkomprimiert|kein|keine"
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "Diese Botschaft könnte für %s unbrauchbar sein\n"
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "Mehrdeutige Option '%s'\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "Unbekannte Option '%s'\n"
@@ -5302,12 +5295,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (Hauptschlüssel-ID %s)"
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5318,24 +5311,24 @@ msgstr ""
 "Benutzer: \"%.*s\"\n"
 "%u-bit %s Schlüssel, ID %s, erzeugt %s%s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 msgid "Repeat passphrase\n"
 msgstr "Geben Sie die Passphrase nochmal ein\n"
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 msgid "Enter passphrase\n"
 msgstr "Geben Sie die Passphrase ein\n"
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr "Abbruch durch Benutzer\n"
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "Problem mit dem Agenten: %s\n"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5344,12 +5337,12 @@ msgstr ""
 "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu entsperren.\n"
 "Benutzer: \"%s\"\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-Bit %s Schlüssel, ID %s, erzeugt %s"
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (Unterschlüssel aus Hauptschlüssel-ID %s)"
@@ -5692,28 +5685,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:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr "Abgetrennte Beglaubigungen.\n"
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr "Bitte geben Sie den Namen der Datendatei ein: "
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr "lese stdin ...\n"
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr "keine unterschriebene Daten\n"
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kann signierte Datei '%s' nicht öffnen.\n"
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "kann signierte Daten auf fd=%d nicht öffnen: %s\n"
@@ -5986,14 +5979,14 @@ msgstr ""
 "Vermutlich eine FALSCHE Unterschrift von Schlüssel %s, wegen unbekanntem "
 "\"critical bit\"\n"
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "Schlüssel %s: Kein Unterschlüssel für die Unterschlüsselwiderruf-"
 "Beglaubigung\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
@@ -6498,17 +6491,28 @@ msgstr "fd=%d kann nicht geöffnet werden: %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "Fehler beim Lesen von `%s': %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr "Siehe %s für weitere Infos\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr "Umwandlung von `%s' in `%s' ist nicht verfügbar\n"
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open fehlgeschlagen: %s\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "Umwandlung von `%s' in `%s' schlug fehl: %s\n"
@@ -6772,18 +6776,18 @@ msgstr ""
 "Synatx: scdaemon [Optionen] [Befehl [Argumente]]\n"
 "Smartcard Daemon für GnuPG\n"
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 "Bitte die Option `--daemon' nutzen um das Programm im Hintergund "
 "auszuführen\n"
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "Handhabungsroutine für fd %d gestartet\n"
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "Handhabungsroutine für den fd %d beendet\n"
@@ -6986,7 +6990,7 @@ msgstr "[Fehler - Kein Name]"
 msgid "[Error - invalid DN]"
 msgstr "[Fehler - Ungültiger DN]"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7302,38 +7306,38 @@ msgstr ""
 "Syntax: gpgsm [Optionen] [Dateien]\n"
 "Signieren, prüfen, ver- und entschlüsseln mittels S/MIME protocol\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 msgid "usage: gpgsm [options] "
 msgstr "Aufruf: gpgsm [Optionen] "
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "Verschlüsseln für `%s' nicht möglich: %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "Importiere allgemeine Zertifikate: %s\n"
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "Signieren mit `%s' nicht möglich: %s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr "Dieser Befehl wurde noch nicht implementiert\n"
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 msgid "key generation is not available from the commandline\n"
 msgstr "Die Schlüsselerzeugung ist über die Kommandozeile nicht möglich\n"
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr ""
@@ -7357,7 +7361,7 @@ msgstr "Grundlegende Zertifikatprüfungen fehlgeschlagen - nicht importiert\n"
 msgid "error importing certificate: %s\n"
 msgstr "Fehler beim Importieren des Zertifikats: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "Fehler beim Lesen der Eingabe: %s\n"
@@ -7430,7 +7434,7 @@ msgstr "Der Fingerabdruck in `%s', Zeile %d is fehlerhaft formatiert\n"
 msgid "invalid country code in `%s', line %d\n"
 msgstr "Ungültiger Landescode in `%s', Zeile %d\n"
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7447,7 +7451,7 @@ msgstr ""
 "\n"
 "%s%sSind Sie wirklich sicher, daß Sie dies möchten?"
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7455,7 +7459,7 @@ msgstr ""
 "Bitte beachten Sie, daß diese Software nicht offiziell zur Erzeugung\n"
 "oder Prüfung von qualifizierten Signaturen zugelassen ist.\n"
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7529,126 +7533,126 @@ msgstr ""
 "Syntax: gpg-connect-agent [Optionen]\n"
 "Mit einem laufenden Agenten verbinden und Befehle senden\n"
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "Option \"%s\" erfordert ein Programm und evtl. Argumente\n"
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "Optuin \"%s\" wird wegen \"%s\" nicht beachtet\n"
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 msgid "line too long - skipped\n"
 msgstr "Zeile zu lang - übersprungen\n"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr "Zeile wegen enthaltenem Nul-Zeichen gekürzt\n"
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, c-format
 msgid "unknown command `%s'\n"
 msgstr "unbekannter Befehl `%s'\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "Senden der Zeile schlug fehl: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "Empfangen der Zeile schlug fehl: %s\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, c-format
 msgid "error sending %s command: %s\n"
 msgstr "Fehler beim Senden des %s-Befehls: %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "Fehler beim Senden der Standardoptionen: %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr "Optionen zur Einstellung Diagnoseausgaben"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr "Optionen zur Einstellung der Konfiguration"
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 msgid "Options useful for debugging"
 msgstr "Nützliche Optionen zum Debuggen"
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr "Optionen zur Einstellung der Sicherheit"
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|lasse SSH Schlüssel im Cache nach N Sekunden verfallen"
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|setze die maximale Lebensdauer von PINs im Cache auf N Sekunden"
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|setze die maximale Lebenszeit von SSH Schlüsseln auf N Sekunden"
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|setze die kleinste erlaubte Länge von Passphrasen auf N"
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr "Konfiguration der Schlüsselserver"
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr "Erlaube PKA Zugriffe (DNS Anfragen)"
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|Benutze die Kodierung NAME für PKCS#12 Passphrasen"
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr "CRL bei Wurzelzertifikaten nicht überprüfen"
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr "Optionen zum Einstellen der Ausgabeformate"
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr "Optionen zur Einstellung der Interaktivität und Geltendmachung"
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr "Konfiguration für HTTP Server"
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr "Einstellungen des System HTTP-Proxy benutzen"
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr "Konfiguration der zu nutzenden LDAP-Server"
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr "Konfiguration zu OCSP"
 
@@ -7688,19 +7692,19 @@ msgstr ""
 "Syntax: gpgconf {Optionen]\n"
 "Verwalte Konfigurationsoptionen für Programme des GnuPG Systems\n"
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 msgid "usage: gpgconf [options] "
 msgstr "Aufruf: gpgconf [Optionen] "
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr "Benötige ein Komponentenargument"
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 msgid "Component not found"
 msgstr "Komponente nicht gefunden"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 msgid "No argument allowed"
 msgstr "Argumente sind nicht erlaubt"
 
@@ -7757,118 +7761,118 @@ msgstr ""
 "keyfileSCHLUESSELDATEI [Optionen...] KOMMANDO [Eingabedatei]\n"
 "Aufruf eines einfachen symmetrischen Verschlüsselungstool\n"
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s auf %s brach mit Status %i ab\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "%s auf %s schlug mit Status %i fehl\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "Das temporäre Verzeichnis `%s' kann nicht erstellt werden: %s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "%s kann nicht zum Schreiben geöffnet werden: %s\n"
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, c-format
 msgid "error writing to %s: %s\n"
 msgstr "Fehler beim Schreiben von %s: %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, c-format
 msgid "error reading from %s: %s\n"
 msgstr "Fehler beim Lesen von %s: %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, c-format
 msgid "error closing %s: %s\n"
 msgstr "Fehler beim Schliessen von %s: %s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 msgid "no --program option provided\n"
 msgstr "Option --programm nicht angegeben\n"
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr "nur --decrypt und --encrypt sind vorhanden\n"
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr "keine --keyfile -Option angegeben\n"
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr "Kann \"args-vector\" nicht zuteilen\n"
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, c-format
 msgid "could not create pipe: %s\n"
 msgstr "Pipe kann nicht erzeugt werden: %s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, c-format
 msgid "could not create pty: %s\n"
 msgstr "Pty kann nicht erzeugt werden: %s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, c-format
 msgid "could not fork: %s\n"
 msgstr "Kann nicht fork()en: %s\n"
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, c-format
 msgid "execv failed: %s\n"
 msgstr "Der execv()-Aufruf ist fehlgeschlagen: %s\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, c-format
 msgid "select failed: %s\n"
 msgstr "Der select()-Aufruf ist fehlgeschlagen: %s\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, c-format
 msgid "read failed: %s\n"
 msgstr "Lesen schlug fehl: %s\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, c-format
 msgid "pty read failed: %s\n"
 msgstr "\"pty read\"-Aufruf ist fehlgeschlagen: %s\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, c-format
 msgid "waitpid failed: %s\n"
 msgstr "Der waitpid()-Aufruf ist fehlgeschlagen: %s\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr "Kind brach mit Status %i ab\n"
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "Kann In-Datei-Zeichenkette keinen Speicher zuteilen: %s\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "Kann Out-Datei-Zeichenkette keinen Speicher zuteilen: %s\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr "entweder %s oder %s muß angegeben sein\n"
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr "keine Klasse angegeben\n"
 
@@ -7877,6 +7881,11 @@ msgstr "keine Klasse angegeben\n"
 msgid "class %s is not supported\n"
 msgstr "Klasse %s wird nicht unterstützt\n"
 
+#~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
+#~ msgstr ""
+#~ "Verschlüsselungserweiterung `%s' wurde wegen unsicherer Zugriffsrechte "
+#~ "nicht geladen\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA benötigt einen 160-bit Hash Algorithmus\n"
 
diff --git a/po/el.po b/po/el.po
index dfbde4e6f..5229dcd56 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+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"
@@ -14,59 +14,59 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 #, fuzzy
 msgid "PIN too long"
 msgstr "� ������ ����� ���� ������\n"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "� ����� ������ ����� ���� ������\n"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "�� ������� ���������� ��� �����\n"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 #, fuzzy
 msgid "Bad PIN"
 msgstr "���� MPI"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "���� ����� ������"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 #, fuzzy
 msgid "Passphrase"
 msgstr "���� ����� ������"
@@ -76,7 +76,7 @@ msgstr "���� ����� ������"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
@@ -85,12 +85,12 @@ msgstr "�������� ����������� ��� `%s': %s\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
@@ -189,13 +189,13 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "������ ��� ������ ������"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "������ ��� ������ ������"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -215,243 +215,243 @@ msgstr ""
 "��������:\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "���������"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "����� ������"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|������|������� ��� ���������� ��������� ������"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "��������� �������� �� ��� ���������� ��������"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "�������� ��� ����� ��������� ������������"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "��������� �� ���������� ��� <[email protected]>\n"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "������ ���� �� ���������� ��� `%s': %s\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�������� ����������� ��������� `%s': %s\n"
 
-#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "������ ��� �������� ���� �� `%s': %s\n"
 
-#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: ��������� �������������\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1359
+#: agent/gpg-agent.c:1358
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: �������� ����������� ���������: %s\n"
 
-#: agent/gpg-agent.c:1461
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1466
+#: agent/gpg-agent.c:1465
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483
+#: agent/gpg-agent.c:1482
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1488
+#: agent/gpg-agent.c:1487
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ������������: %s\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "��������������� ��������� ������������� GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
@@ -478,80 +478,80 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 #, fuzzy
 msgid "Passphrase:"
 msgstr "���� ����� ������"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 #, fuzzy
 msgid "cancelled\n"
 msgstr "�������"
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "������� ��� �������� �������� ��� ����� ���������\n"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "������ ���������: %s\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -564,7 +564,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -574,7 +574,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr ""
 
@@ -586,19 +586,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 #, fuzzy
 msgid "Yes"
 msgstr "���|���"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr ""
 
@@ -642,45 +642,45 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "������ ���� �� ���������� ��� `%s': %s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 #, fuzzy
 msgid "host not found"
 msgstr "[User id ��� �������]"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr "�������� ������������ �� �� gpg-agent\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "��������� ��� �� ������\n"
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "�������� ��������������� ��� core dump: %s\n"
@@ -857,11 +857,11 @@ msgstr "�������������: �������� �� ������ �������� ���������\n"
 msgid "not human readable"
 msgstr "�� ����������"
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1179,7 +1179,7 @@ msgstr "�� ������ ������  (��������� \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "�������� ��������� ��� `%s'\n"
@@ -1750,559 +1750,552 @@ msgstr "Hash: "
 msgid "Compression: "
 msgstr "��������: "
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "�����: gpg [��������] "
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "������������� �������\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
 
-#: g10/gpg.c:2266
-#, fuzzy, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr ""
-"� �������� ��� ��������������� \"%s\" ��� ��������� ������ ��������\n"
-"���������� ������\n"
-
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 msgid "invalid import options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 msgid "invalid export options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2582
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�������� ������� ��� exec-path �� %s\n"
 
-#: g10/gpg.c:2804
+#: g10/gpg.c:2781
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�������������: �� %s ����������� �� %s\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/gpg.c:2938
+#: g10/gpg.c:2915
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2921
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
 "���������\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:2927
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
 
-#: g10/gpg.c:2963
+#: g10/gpg.c:2940
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "� ����������� ���������� ��������� ��� �����������\n"
 "��� ����� �������\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3041
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/gpg.c:3066
+#: g10/gpg.c:3043
 #, 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:3068
+#: g10/gpg.c:3045
 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:3070
+#: g10/gpg.c:3047
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3050
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3054
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3061
 msgid "invalid default preferences\n"
 msgstr "�� ������� �����������\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 msgid "invalid personal cipher preferences\n"
 msgstr "�� ������� ����������� ���������� ���������������\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 msgid "invalid personal digest preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 msgid "invalid personal compress preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3186
+#: g10/gpg.c:3163
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3191
+#: g10/gpg.c:3168
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/gpg.c:3294
+#: g10/gpg.c:3271
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3329
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3380
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3400
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3556
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "������� �������� �������: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver ��������� �������: %s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4184
+#: g10/gpg.c:4161
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4217
+#: g10/gpg.c:4194
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
@@ -5233,98 +5226,98 @@ msgstr "�������� ������ ���� (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�� ������ ������(root) ������ ����������� ��� proc_tree()\n"
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "�������� ��������� ��� �������: %s\n"
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "�� ������������ ���������� ��������������"
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "�� ����� ��� ��������������� IDEA ��� �������\n"
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = ���������� ������������ �����������\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: �� ������������ ������� \"%s\"\n"
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "�������� �������������� �� \"%s%s\" ��������\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 msgid "Uncompressed"
 msgstr "����������"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "����������"
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "���� �� ������ ���� ��� ������ �� �������������� ��� %s\n"
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
@@ -5382,12 +5375,12 @@ msgstr "�������������: ������� �� ������� ��������������� ���������� ������\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��������� ����� %d ���� �������� �� ������� bit\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (����� ������, ID %08lX)"
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5399,24 +5392,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s ������, ID %08lX, ���������� %s%s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 msgid "Repeat passphrase\n"
 msgstr "����������� �� �����\n"
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 msgid "Enter passphrase\n"
 msgstr "�������������� �� ����� ������\n"
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr "��������� ��� �� ������\n"
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5426,12 +5419,12 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������ �� ������� ������\n"
 "��� �� ������: \""
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit %s ������, ID %08lX, ���������� %s"
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5776,28 +5769,28 @@ msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "�������� ��� �������������. ���������� �� ��� ������� \"--output\"\n"
 
-#: g10/plaintext.c:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr "���������� ��������.\n"
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr "�������� �� ����� ������� ���������: "
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr "�������� ��� stdin ...\n"
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr "��� �������� ������������� ��������\n"
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "�������� ��������� �������������� ��������� `%s'\n"
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "�������� ��������� �������������� ��������� `%s'\n"
@@ -6067,12 +6060,12 @@ msgstr "��������: �� ������ ��������� %08lX ����� ���� %s\n"
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "������� ����� ��������� ��� ������ %08lX ���� �������� �������� bit\n"
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "������ %08lX: ������ ��������� ��� �� ������ ��������� �����������\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� �����������\n"
@@ -6568,17 +6561,28 @@ msgstr "�������� ��������� ��� `%s': %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "������� ��� bug ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr "����� �� http://www.gnupg.org/faq.html ��� ������������ �����������\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "�������� ��������� ��� �������: %s\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "�������� �������: %s\n"
@@ -6847,16 +6851,16 @@ msgid ""
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7064,7 +7068,7 @@ msgstr ""
 msgid "[Error - invalid DN]"
 msgstr "������: �� ������ ���������\n"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7387,40 +7391,40 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "�����: gpg [��������] "
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "������� ���  `%s'\n"
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 #, fuzzy
 msgid "key generation is not available from the commandline\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, fuzzy, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
@@ -7444,7 +7448,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@ -7517,7 +7521,7 @@ msgstr "������: �� ������ ���������\n"
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7528,13 +7532,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7607,128 +7611,128 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "� ������ ����� ���� ������\n"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "� �������� �������: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "������ ��� �������� ���� �� `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "������ ��� �������� ���� �� `%s': %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|�����|����� ���������� �������������� ����� ��� ������� �������"
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr ""
 
@@ -7768,21 +7772,21 @@ msgid ""
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "�����: gpg [��������] "
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 #, fuzzy
 msgid "Component not found"
 msgstr "��� ������� �� ������� ������"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 #, fuzzy
 msgid "No argument allowed"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
@@ -7841,119 +7845,119 @@ msgid ""
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "�������� ��������� ��� �������: %s\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "�������� ����������� ��������� `%s': %s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "�������� ��������� ��� %s: %s\n"
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "�������� �������� ��� ����������� `%s': %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "��� ������������ � ������������� �������� ������������\n"
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr ""
 
@@ -7962,6 +7966,12 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
+#, fuzzy
+#~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
+#~ msgstr ""
+#~ "� �������� ��� ��������������� \"%s\" ��� ��������� ������ ��������\n"
+#~ "���������� ������\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "� DSA ������� �� ����� ���� 160 bit ���������� hash\n"
 
@@ -8232,10 +8242,6 @@ msgstr "��� ������������� � ���������� ���������� %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"
 
diff --git a/po/eo.po b/po/eo.po
index 116e78d65..14e8d5490 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+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"
@@ -14,59 +14,59 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-3\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 #, fuzzy
 msgid "PIN too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nevalida signo en nomo\n"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 #, fuzzy
 msgid "Bad PIN"
 msgstr "malbona MPI"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "malbona pasfrazo"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 #, fuzzy
 msgid "Passphrase"
 msgstr "malbona pasfrazo"
@@ -76,7 +76,7 @@ msgstr "malbona pasfrazo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
@@ -85,12 +85,12 @@ msgstr "ne povas krei '%s': %s\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
@@ -190,13 +190,13 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -216,242 +216,242 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "detala eligo"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "ser�i �losilojn �e �losilservilo"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualigi la fido-datenaron"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: dosierujo kreita\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1359
+#: agent/gpg-agent.c:1358
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:1461
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1466
+#: agent/gpg-agent.c:1465
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483
+#: agent/gpg-agent.c:1482
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1488
+#: agent/gpg-agent.c:1487
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu �losiloj ignoritaj\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 #, 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:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
@@ -478,80 +478,80 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 #, fuzzy
 msgid "Passphrase:"
 msgstr "malbona pasfrazo"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 #, fuzzy
 msgid "cancelled\n"
 msgstr "nuligita de uzanto\n"
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "sekretaj �losilpartoj ne estas disponataj\n"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "kiraso: %s\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -564,7 +564,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -574,7 +574,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr ""
 
@@ -586,19 +586,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 #, fuzzy
 msgid "Yes"
 msgstr "jes"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr ""
 
@@ -642,45 +642,45 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 #, fuzzy
 msgid "host not found"
 msgstr "%s: uzanto ne trovita\n"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr "komunikproblemo kun gpg-agent\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "nuligita de uzanto\n"
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ne povas mal�alti kreadon de core-dosieroj: %s\n"
@@ -860,11 +860,11 @@ msgstr "AVERTO: nevalida notacia dateno trovita\n"
 msgid "not human readable"
 msgstr "ne homlegebla"
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1182,7 +1182,7 @@ msgstr "Nevalida komando (provu per \"helpo\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por �i tiu komando\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
@@ -1735,553 +1735,548 @@ msgstr ""
 msgid "Compression: "
 msgstr "Komento: "
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "montri, en kiu �losilaro estas listigita �losilo"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/gpg.c:2266
-#, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr ""
-
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2582
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2804
+#: g10/gpg.c:2781
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/gpg.c:2938
+#: g10/gpg.c:2915
 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:2944
+#: g10/gpg.c:2921
 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:2950
+#: g10/gpg.c:2927
 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:2963
+#: g10/gpg.c:2940
 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:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3041
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/gpg.c:3066
+#: g10/gpg.c:3043
 #, 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:3068
+#: g10/gpg.c:3045
 #, 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:3070
+#: g10/gpg.c:3047
 #, 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:3073
+#: g10/gpg.c:3050
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3054
 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:3084
+#: g10/gpg.c:3061
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, 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:3186
+#: g10/gpg.c:3163
 #, 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:3191
+#: g10/gpg.c:3168
 #, 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:3283
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/gpg.c:3294
+#: g10/gpg.c:3271
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3329
 #, 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:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3380
 #, 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:3423
+#: g10/gpg.c:3400
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3556
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/gpg.c:4184
+#: g10/gpg.c:4161
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:4217
+#: g10/gpg.c:4194
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@ -5197,97 +5192,97 @@ msgstr "malnovstila subskribo (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "ne povas trakti publik�losilan metodon %d\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "nerealigita �ifrad-metodo"
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "la aldona�o por la �ifro IDEA en �eestas\n"
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = bonvolu montri pli da informoj\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 #, fuzzy
 msgid "Uncompressed"
 msgstr "ne traktita"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "ne traktita"
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, fuzzy, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
@@ -5344,12 +5339,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (�ef�losilo %08lX)"
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5360,24 +5355,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bita %s �losilo, ID %08lX, kreita je %s%s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 msgid "Repeat passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 msgid "Enter passphrase\n"
 msgstr "Donu pasfrazon\n"
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr "nuligita de uzanto\n"
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5387,12 +5382,12 @@ msgstr ""
 "Vi bezonas pasfrazon por mal�losi la sekretan �losilon\n"
 "por la uzanto: \""
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bita %s-�losilo, %08lX, kreita je %s"
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5731,28 +5726,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:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr "Aparta subskribo.\n"
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr "Bonvolu doni la nomon de la dosiero: "
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr "legas la normalan enigon ...\n"
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr "mankas subskribitaj datenoj\n"
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
@@ -6014,12 +6009,12 @@ msgstr "NOTO: subskribo-�losilo %08lX eksvalidi�is je %s\n"
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n"
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
@@ -6503,17 +6498,28 @@ msgstr "ne povas malfermi '%s': %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vi trovis cimon ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "eraro dum legado de '%s': %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr "bonvolu vidi http://www.gnupg.org/faq.html por pliaj informoj\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
@@ -6782,16 +6788,16 @@ msgid ""
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7008,7 +7014,7 @@ msgstr ""
 msgid "[Error - invalid DN]"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7330,40 +7336,40 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 #, fuzzy
 msgid "key generation is not available from the commandline\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, fuzzy, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
@@ -7387,7 +7393,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -7460,7 +7466,7 @@ msgstr "%s: nevalida dosiero-versio %d\n"
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7471,13 +7477,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7550,128 +7556,128 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "pasfrazo estas tro longa\n"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO por pasfrazoj"
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr ""
 
@@ -7711,21 +7717,21 @@ msgid ""
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 #, fuzzy
 msgid "Component not found"
 msgstr "publika �losilo ne trovita"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 #, fuzzy
 msgid "No argument allowed"
 msgstr "skribas sekretan �losilon al '%s'\n"
@@ -7784,118 +7790,118 @@ msgid ""
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 msgid "no --program option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, fuzzy, c-format
 msgid "could not fork: %s\n"
 msgstr "%s: uzanto ne trovita: %s\n"
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr ""
 
@@ -8164,9 +8170,6 @@ msgstr "protekto-metodo %d%s ne estas realigita\n"
 #~ msgid "WARNING: using insecure memory!\n"
 #~ msgstr "Averto: uzas malsekuran memoron!\n"
 
-#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
-#~ msgstr "bonvolu vidi http://www.gnupg.org/faq.html por pliaj informoj\n"
-
 #~ msgid "operation is not possible without initialized secure memory\n"
 #~ msgstr "operacio ne eblas sen sekura memoro kun komenca valoro\n"
 
diff --git a/po/es.po b/po/es.po
index c5cfec9d0..e67d73085 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+0200\n"
 "PO-Revision-Date: 2005-03-25 16:50+0100\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -18,49 +18,49 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "fallo al almacenar la huella digital: %s\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 #, fuzzy
 msgid "PIN too long"
 msgstr "l�nea demasiado larga"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "frase contrase�a demasiado larga\n"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter inv�lido en el nombre\n"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorrecto"
@@ -74,7 +74,7 @@ msgstr "MPI incorrecto"
 # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
 # �Es que son m�s listos? :-)
 #
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "Frase contrase�a incorrecta"
@@ -88,7 +88,7 @@ msgstr "Frase contrase�a incorrecta"
 # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
 # �Es que son m�s listos? :-)
 #
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 #, fuzzy
 msgid "Passphrase"
 msgstr "Frase contrase�a incorrecta"
@@ -98,7 +98,7 @@ msgstr "Frase contrase�a incorrecta"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "el resumen protector %d no puede ser utilizado\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
@@ -107,12 +107,12 @@ msgstr "no se puede crear %s: %s\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
@@ -211,13 +211,13 @@ msgstr ""
 "Necesita una frase contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr ""
 
@@ -226,7 +226,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -237,243 +237,243 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "prolijo"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "busca claves en un servidor de claves"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "establecer preferencias para todos los ID seleccionados"
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualiza la base de datos de confianza"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, 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:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error creando `%s': %s\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no se puede crear el directorio `%s': %s\n"
 
-#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "error enviando a `%s': %s\n"
 
-#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "directorio `%s' creado\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) fall� en %s: %s\n"
 
-#: agent/gpg-agent.c:1359
+#: agent/gpg-agent.c:1358
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: no se puede crear el directorio: %s\n"
 
-#: agent/gpg-agent.c:1461
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1466
+#: agent/gpg-agent.c:1465
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483
+#: agent/gpg-agent.c:1482
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1488
+#: agent/gpg-agent.c:1487
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
 # msgstr "clave %08lX: %d nuevas subclaves\n"
-#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu claves omitidas\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "el agente gpg no esta disponible en esta sesi�n\n"
 
-#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
 
-#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "el programa no permite usar el protocolo agente gpg versi�n %d\n"
@@ -500,23 +500,23 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
@@ -532,57 +532,57 @@ msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
 # �Es que son m�s listos? :-)
 #
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 #, fuzzy
 msgid "Passphrase:"
 msgstr "Frase contrase�a incorrecta"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 #, fuzzy
 msgid "cancelled\n"
 msgstr "cancelado"
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "error en `%s': %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "las partes de la clave privada no est�n disponibles\n"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "error de lectura `%s': %s\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -595,7 +595,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -605,7 +605,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr ""
 
@@ -617,19 +617,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 #, fuzzy
 msgid "Yes"
 msgstr "s�"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr ""
 
@@ -673,45 +673,45 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "error creando `%s': %s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 #, fuzzy
 msgid "host not found"
 msgstr "%s: usuario no encontrado\n"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr "el agente gpg no esta disponible en esta sesi�n\n"
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no se puede conectar con `%s': %s\n"
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr "problema de comunicaci�n con el agente gpg\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "problema con el agente: el agente devuelve 0x%lx\n"
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "cancelado por el usuario\n"
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problema con el agente: el agente devuelve 0x%lx\n"
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no se pueden desactivar los volcados de core: %s\n"
@@ -885,11 +885,11 @@ msgstr "ATENCI�N: encontrados datos de notaci�n inv�lidos\n"
 msgid "not human readable"
 msgstr "ilegible"
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1183,7 +1183,7 @@ 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:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no se puede abrir `%s'\n"
@@ -1746,55 +1746,55 @@ msgstr "Resumen: "
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no se encontr� el signo = en la definici�n de grupo `%s'\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio personal `%s'\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedad insegura del fichero de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedad insegura de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio personal `%s'\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros del fichero de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio contenedor de `%s'\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1802,18 +1802,18 @@ msgstr ""
 "AVISO: propiedad insegura del directorio contenedor del fichero de\n"
 "configuraci�n `%s'\n"
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVISO: propiedad insegura del directorio contenedor de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio contenedor de `%s'\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1821,451 +1821,446 @@ msgstr ""
 "AVISO: permisos inseguros del directorio contenedor del fichero de\n"
 "configuraci�n `%s'\n"
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVISO: permisos inseguros del directorio contenedor de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "art�culo de configuraci�n desconocido `%s'\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "muestra en qu� anillos est� una clave"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/gpg.c:2266
-#, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr "no se carga el cifrado de ampliaci�n `%s' por permisos inseguros\n"
-
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2492
 #, 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:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2527
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2530
 msgid "invalid keyserver options\n"
 msgstr "opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 msgid "invalid import options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 msgid "invalid export options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 msgid "invalid list options\n"
 msgstr "lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2582
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 msgid "invalid verify options\n"
 msgstr "opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/gpg.c:2804
+#: g10/gpg.c:2781
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, 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:2938
+#: g10/gpg.c:2915
 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:2944
+#: g10/gpg.c:2921
 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:2950
+#: g10/gpg.c:2927
 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:2963
+#: g10/gpg.c:2940
 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:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3041
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/gpg.c:3066
+#: g10/gpg.c:3043
 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:3068
+#: g10/gpg.c:3045
 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:3070
+#: g10/gpg.c:3047
 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:3073
+#: g10/gpg.c:3050
 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:3077
+#: g10/gpg.c:3054
 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:3084
+#: g10/gpg.c:3061
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inv�lidas\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inv�lidas\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresi�n inv�lidas\n"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s a�n no funciona con %s\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, 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:3186
+#: g10/gpg.c:3163
 #, 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:3191
+#: g10/gpg.c:3168
 #, 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:3283
+#: g10/gpg.c:3260
 #, 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:3294
+#: g10/gpg.c:3271
 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:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "el cifrado sim�trico de `%s' fall�: %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 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:3352
+#: g10/gpg.c:3329
 #, 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:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 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:3403
+#: g10/gpg.c:3380
 #, 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:3423
+#: g10/gpg.c:3400
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepci�n del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3556
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportaci�n de clave fallida: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "b�squeda del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovaci�n al servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -2273,19 +2268,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:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica de certificado inv�lida\n"
 
-#: g10/gpg.c:4184
+#: g10/gpg.c:4161
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
-#: g10/gpg.c:4217
+#: g10/gpg.c:4194
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
@@ -5120,95 +5115,95 @@ msgstr "firma al viejo estilo (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z inv�lido detectado en proc_tree()\n"
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat de `%s' fall� en %s: %s\n"
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) fall� en %s: %s\n"
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "AVISO: usando un algoritmo de clave p�blica experimental %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "AVISO: usando algoritmo de cifrado experimental %s\n"
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "AVISO: usando algoritmo de resumen experimental %s\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVISO: el algoritmo de resumen %s es una opci�n desaconsejada\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "el plugin para el cifrado IDEA no est� presente\n"
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = por favor mu�streme m�s informaci�n\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opci�n desaconsejada \"%s\"\n"
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATENCI�N: \"%s\" es una opci�n desaconsejada\n"
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor use \"%s%s\" en su lugar\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ATENCI�N: \"%s\" es una opci�n desaconsejada\n"
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "ATENCI�N: \"%s\" es una opci�n desaconsejada\n"
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 msgid "Uncompressed"
 msgstr "Sin comprimir"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 msgid "uncompressed|none"
 msgstr "sin_comprimir|ninguno"
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "este mensaje podr�a no ser utilizable por %s\n"
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "opci�n ambigua `%s'\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "opci�n desconocida `%s'\n"
@@ -5265,12 +5260,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquete de tipo %d tiene el bit cr�tico activado\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, c-format
 msgid " (main key ID %s)"
 msgstr "(ID de clave primaria %s)"
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5281,24 +5276,24 @@ msgstr ""
 "del usuario: \"%.*s\"\n"
 "%u bits, clave %s, ID %s, creada el %s%s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 msgid "Repeat passphrase\n"
 msgstr "Repita frase contrase�a\n"
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 msgid "Enter passphrase\n"
 msgstr "Introduzca frase contrase�a\n"
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr "cancelado por el usuario\n"
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema con el agente: el agente devuelve 0x%lx\n"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5307,12 +5302,12 @@ msgstr ""
 "Necesita una frase contrase�a para desbloquear la clave secreta\n"
 "del usuario: \"%s\"\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "clave %2$s de %1$u bits, ID %3$s, creada el %4$s"
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (subclave en clave principal ID %s)"
@@ -5645,28 +5640,28 @@ msgstr "clave %s: sin identificador de usuario\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "datos no grabados; use la opci�n \"--output\" para grabarlos\n"
 
-#: g10/plaintext.c:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr "Firma separada.\n"
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr "Introduzca el nombre del fichero de datos: "
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr "leyendo stdin...\n"
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr "no hay datos firmados\n"
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposible abrir datos firmados `%s'\n"
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "imposible abrir datos firmados `%s'\n"
@@ -5930,12 +5925,12 @@ msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "asumiendo firma incorrecta de la clave %s por un bit cr�tico desconocido\n"
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "clave %s: no hay subclave para la firma de revocaci�n de subclave\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "clave %s: no hay subclave para firma de subclave de enlace\n"
@@ -6425,17 +6420,28 @@ msgstr "no se puede abrir `%s': %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "ha encontrado un error... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "error leyendo `%s': %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr "por favor, vea http://www.gnupg.org/faq.html para m�s informaci�n\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "no puede abrirse el fichero: %s\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "renombrando `%s' en `%s' fallo: %s\n"
@@ -6701,16 +6707,16 @@ msgid ""
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6927,7 +6933,7 @@ msgstr ""
 msgid "[Error - invalid DN]"
 msgstr "Error: respuesta no v�lida.\n"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7256,40 +7262,40 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpgm [opciones] "
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "no se puede conectar con `%s': %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "no se puede acceder a `%s': %s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 #, fuzzy
 msgid "key generation is not available from the commandline\n"
 msgstr "el agente gpg no esta disponible en esta sesi�n\n"
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, fuzzy, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "Por favor seleccione tipo de clave que generar:\n"
@@ -7313,7 +7319,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "error obteniendo el n�mero de serie: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "error leyendo `%s': %s\n"
@@ -7386,7 +7392,7 @@ msgstr "Error: formato inv�lido de huella dactilar.\n"
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7397,13 +7403,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7476,129 +7482,129 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "l�nea demasiado larga"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "opci�n desconocida `%s'\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "fallo leyendo la clave\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "error enviando a `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "error enviando a `%s': %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "habilita depuraci�n completa"
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las contrase�as"
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr ""
 
@@ -7638,21 +7644,21 @@ msgid ""
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uso: gpg [opciones] "
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 #, fuzzy
 msgid "Component not found"
 msgstr "Clave p�blica no encontrada"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 #, fuzzy
 msgid "No argument allowed"
 msgstr "No se permiten �rdenes de administrador\n"
@@ -7715,119 +7721,119 @@ msgid ""
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "fstat de `%s' fall� en %s: %s\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "no se puede crear el directorio `%s': %s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "no se puede abrir `%s': %s\n"
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "error en `%s': %s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "no es posible ejecutar programas remotos\n"
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, fuzzy, c-format
 msgid "could not fork: %s\n"
 msgstr "%s: usuario no encontrado: %s\n"
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "borrado de bloque de anillo de claves fallido: %s\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "%s: no se puede crear el anillo: %s\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "no se puede crear fichero de respaldo `%s': %s\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr ""
 
@@ -7836,6 +7842,9 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "el resumen protector %d no puede ser utilizado\n"
 
+#~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
+#~ msgstr "no se carga el cifrado de ampliaci�n `%s' por permisos inseguros\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA necesita un algoritmo de hash de 160 bits.\n"
 
@@ -8161,9 +8170,6 @@ msgstr "el resumen protector %d no puede ser utilizado\n"
 #~ msgid "WARNING: using insecure memory!\n"
 #~ msgstr "ATENCI�N: �se est� usando memoria insegura!\n"
 
-#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
-#~ msgstr "por favor, vea http://www.gnupg.org/faq.html para m�s informaci�n\n"
-
 #~ msgid "operation is not possible without initialized secure memory\n"
 #~ msgstr "operaci�n imposible sin memoria segura inicializada\n"
 
diff --git a/po/et.po b/po/et.po
index d42fd68c3..8cf160a7d 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+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"
@@ -14,59 +14,59 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 #, fuzzy
 msgid "PIN too long"
 msgstr "rida on liiga pikk\n"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "liiga pikk parool\n"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 #, fuzzy
 msgid "Bad PIN"
 msgstr "halb MPI"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "halb parool"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 #, fuzzy
 msgid "Passphrase"
 msgstr "halb parool"
@@ -76,7 +76,7 @@ msgstr "halb parool"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
@@ -85,12 +85,12 @@ msgstr "`%s' ei �nnestu luua: %s\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
@@ -189,13 +189,13 @@ msgstr ""
 "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muuda parooli"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "muuda parooli"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -215,242 +215,242 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "ole m�nev�rra vaiksem"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "otsi v�tmeid v�tmeserverist"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "uuenda usalduse andmebaasi"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: kataloog on loodud\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1359
+#: agent/gpg-agent.c:1358
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: kataloogi ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1461
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1466
+#: agent/gpg-agent.c:1465
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483
+#: agent/gpg-agent.c:1482
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1488
+#: agent/gpg-agent.c:1487
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: j�tsin vahele: %s\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 
-#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
@@ -477,80 +477,80 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 #, fuzzy
 msgid "Passphrase:"
 msgstr "halb parool"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Katkesta"
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "salajase v�tme komponendid ei ole k�ttesaadavad\n"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "viga lugemisel: %s\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -563,7 +563,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -573,7 +573,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr ""
 
@@ -585,19 +585,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 #, fuzzy
 msgid "Yes"
 msgstr "jah"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr ""
 
@@ -641,45 +641,45 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 #, fuzzy
 msgid "host not found"
 msgstr "[Kasutaja id puudub]"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr "probleem gpg-agent programmiga suhtlemisel\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "katkestatud kasutaja poolt\n"
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ei �nnestu blokeerida m�lupildi salvestamist: %s\n"
@@ -855,11 +855,11 @@ msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
 msgid "not human readable"
 msgstr "pole inimese poolt loetav"
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1177,7 +1177,7 @@ 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:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' ei �nnestu avada\n"
@@ -1741,546 +1741,541 @@ msgstr "R�si: "
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "M�RKUS: ignoreerin vana vaikimisi v�tmete faili `%s'\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/gpg.c:2266
-#, fuzzy, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr "ebaturvaliste �iguste t�ttu ei laetud �ifri laiendust \"%s\"\n"
-
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 msgid "invalid import options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 msgid "invalid export options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2582
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
 
-#: g10/gpg.c:2804
+#: g10/gpg.c:2781
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, 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:2938
+#: g10/gpg.c:2915
 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:2944
+#: g10/gpg.c:2921
 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:2950
+#: g10/gpg.c:2927
 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:2963
+#: g10/gpg.c:2940
 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:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3041
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/gpg.c:3066
+#: g10/gpg.c:3043
 #, 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:3068
+#: g10/gpg.c:3045
 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:3070
+#: g10/gpg.c:3047
 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:3073
+#: g10/gpg.c:3050
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3054
 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:3084
+#: g10/gpg.c:3061
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku �ifri eelistused\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku l�hendi eelistused\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei t��ta veel koos %s-ga\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, 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:3186
+#: g10/gpg.c:3163
 #, 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:3191
+#: g10/gpg.c:3168
 #, 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:3283
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3294
+#: g10/gpg.c:3271
 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:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3329
 #, 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:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3380
 #, 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:3423
+#: g10/gpg.c:3400
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3556
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "v�tme eksport eba�nnestus: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/gpg.c:4184
+#: g10/gpg.c:4161
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:4217
+#: g10/gpg.c:4194
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -5164,97 +5159,97 @@ msgstr "vana stiili (PGP 2.x) allkiri\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "faili ei �nnestu avada: %s\n"
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "realiseerimata �ifri algoritm"
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA �ifri lisandprogrammi pole\n"
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = esita palun t�iendavat infot\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: ebasoovitav v�ti \"%s\"\n"
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "palun kasutage selle asemel \"%s%s\"\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 msgid "Uncompressed"
 msgstr "Pakkimata"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Pakkimata"
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "see teade ei pruugi olla programmiga %s kasutatav\n"
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
@@ -5313,12 +5308,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (peamise v�tme ID %08lX)"
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5329,24 +5324,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bitti %s v�ti, ID %08lX, loodud %s%s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 msgid "Repeat passphrase\n"
 msgstr "Korrake parooli\n"
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 msgid "Enter passphrase\n"
 msgstr "Sisestage parool\n"
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr "katkestatud kasutaja poolt\n"
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5356,12 +5351,12 @@ msgstr ""
 "Te vajate kasutaja salajase v�tme lahtilukustamiseks\n"
 "parooli: \""
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bitine %s v�ti, ID %08lX, loodud %s"
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5697,28 +5692,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:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr "Eraldiseisev allkiri.\n"
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr "Palun sisestage andmefaili nimi: "
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr "loen standardsisendit ...\n"
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr "allkirjastatud andmeid pole\n"
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
@@ -5981,12 +5976,12 @@ msgstr "M�RKUS: allkirja v�ti %08lX aegus %s\n"
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "eeldan tundmatu kriitilise biti t�ttu v�tmel %08lX vigast allkirja\n"
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "v�ti %08lX: alamv�tme t�histamise paketile puudub alamv�ti\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "v�ti %08lX: alamv�tme allkirjaga sidumiseks puudub alamv�ti\n"
@@ -6472,17 +6467,28 @@ msgstr "`%s' ei �nnestu avada: %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "te leidsite vea ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr "Lisainfot leiate lehelt http://www.gnupg.org/faq.html\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "faili ei �nnestu avada: %s\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
@@ -6751,16 +6757,16 @@ msgid ""
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6968,7 +6974,7 @@ msgstr ""
 msgid "[Error - invalid DN]"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7290,40 +7296,40 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "`%s' ei �nnestu sulgeda: %s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 #, fuzzy
 msgid "key generation is not available from the commandline\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, fuzzy, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
@@ -7347,7 +7353,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -7420,7 +7426,7 @@ msgstr "viga: vigane s�rmej�lg\n"
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7431,13 +7437,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7510,128 +7516,128 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "rida on liiga pikk\n"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NIMI|kasuta paroolidega �ifri algoritmi NIMI"
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr ""
 
@@ -7671,21 +7677,21 @@ msgid ""
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 #, fuzzy
 msgid "Component not found"
 msgstr "ei leia avalikku v�tit"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 #, fuzzy
 msgid "No argument allowed"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
@@ -7744,119 +7750,119 @@ msgid ""
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "faili ei �nnestu avada: %s\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "%s ei �nnestu avada: %s\n"
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "mittelokaalse programmi k�ivitamist ei toetata\n"
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr ""
 
@@ -7865,6 +7871,10 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
+#, fuzzy
+#~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
+#~ msgstr "ebaturvaliste �iguste t�ttu ei laetud �ifri laiendust \"%s\"\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA n�uab 160 bitist r�sialgoritmi kasutamist\n"
 
@@ -8134,9 +8144,6 @@ msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 #~ msgid "WARNING: using insecure memory!\n"
 #~ msgstr "HOIATUS: kasutan ebaturvalist m�lu!\n"
 
-#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
-#~ msgstr "Lisainfot leiate lehelt http://www.gnupg.org/faq.html\n"
-
 #~ msgid "operation is not possible without initialized secure memory\n"
 #~ msgstr "initsialiseerimata turvalise m�luta ei ole operatsioon v�imalik\n"
 
diff --git a/po/fi.po b/po/fi.po
index 9712c277c..e5efcc41d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+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"
@@ -30,59 +30,59 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 #, fuzzy
 msgid "PIN too long"
 msgstr "rivi on liian pitkä\n"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "salasana on liian pitkä\n"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI ei kelpaa"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "väärä salasana"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 #, fuzzy
 msgid "Passphrase"
 msgstr "väärä salasana"
@@ -92,7 +92,7 @@ msgstr "väärä salasana"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
@@ -101,12 +101,12 @@ msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
@@ -205,13 +205,13 @@ msgstr ""
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr ""
 
@@ -220,7 +220,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -231,104 +231,104 @@ msgstr ""
 "Valitsimet:\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "monisanainen"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "ole jonkinverran hiljaisempi"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "päivitä luottamustietokanta"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 #, fuzzy
@@ -336,138 +336,138 @@ msgid "Please report bugs to <"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <[email protected]>.\n"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: hakemisto luotu\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1359
+#: agent/gpg-agent.c:1358
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: hakemistoa ei voi luoda: %s\n"
 
-#: agent/gpg-agent.c:1461
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1466
+#: agent/gpg-agent.c:1465
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483
+#: agent/gpg-agent.c:1482
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1488
+#: agent/gpg-agent.c:1487
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ohitettu: %s\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 #, 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:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
 
-#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
@@ -494,80 +494,80 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 #, fuzzy
 msgid "Passphrase:"
 msgstr "väärä salasana"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Peru"
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "lukuvirhe: %s\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -590,7 +590,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr ""
 
@@ -602,19 +602,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 #, fuzzy
 msgid "Yes"
 msgstr "kyllä|kylla|joo"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr ""
 
@@ -658,45 +658,45 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 #, fuzzy
 msgid "host not found"
 msgstr "[Käyttäjätunnusta ei löytynyt]"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agentin kanssa yhteysongelma\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "käyttäjän peruma\n"
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "core-tiedostojen luontia ei voi estää: %s\n"
@@ -874,11 +874,11 @@ msgstr "VAROITUS: löydettiin väärin muotoiltua notaatiodataa\n"
 msgid "not human readable"
 msgstr "ei ihmisten luettavissa"
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1196,7 +1196,7 @@ msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
@@ -1761,547 +1761,542 @@ msgstr "Tiiviste: "
 msgid "Compression: "
 msgstr "Pakkaus: "
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=-merkkiä ei löytynyt ryhmämäärityksessä \"%s\"\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
 
-#: g10/gpg.c:2266
-#, fuzzy, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr "Oikeudet eivät ole turvallisia, salainlaajennuksia \"%s\" ei ladattu\n"
-
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2582
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/gpg.c:2804
+#: g10/gpg.c:2781
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/gpg.c:2938
+#: g10/gpg.c:2915
 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:2944
+#: g10/gpg.c:2921
 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:2950
+#: g10/gpg.c:2927
 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:2963
+#: g10/gpg.c:2940
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3041
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/gpg.c:3066
+#: g10/gpg.c:3043
 #, 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:3068
+#: g10/gpg.c:3045
 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:3070
+#: g10/gpg.c:3047
 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:3073
+#: g10/gpg.c:3050
 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:3077
+#: g10/gpg.c:3054
 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:3084
+#: g10/gpg.c:3061
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, 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:3186
+#: g10/gpg.c:3163
 #, 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:3191
+#: g10/gpg.c:3168
 #, 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:3283
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/gpg.c:3294
+#: g10/gpg.c:3271
 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:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3329
 #, 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:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3380
 #, 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:3423
+#: g10/gpg.c:3400
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key käyttäjätunnus"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key käyttäjätunnus [komennot]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3556
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4184
+#: g10/gpg.c:4161
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4217
+#: g10/gpg.c:4194
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@ -5217,98 +5212,98 @@ msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "epäkelpo juuripaketti havaittu proc_tree():ssä\n"
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "salausalgoritmi ei ole käytössä"
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA-salaimen liitännäinen ei käytettävissä\n"
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = näytä lisätietoja\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: paheksuttava valitsin \"%s\"\n"
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "käytä valitsinta \"%s%s\" sen sijaan\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 msgid "Uncompressed"
 msgstr "pakkaamaton"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "pakkaamaton"
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "%s ei kenties voi käsitellä tätä viestiä\n"
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
@@ -5367,12 +5362,12 @@ msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (pääavaimen tunnus %08lX)"
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5383,24 +5378,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 msgid "Repeat passphrase\n"
 msgstr "Toista salasana\n"
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 msgid "Enter passphrase\n"
 msgstr "Syötä salasana\n"
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr "käyttäjän peruma\n"
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5409,12 +5404,12 @@ msgstr ""
 "\n"
 "Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle: \""
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s"
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5761,28 +5756,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:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr "Erillinen allekirjoitus.\n"
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr "Anna datatiedoston nimi: "
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr "luetaan vakiosyötettä ...\n"
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr "ei allekirjoitettua dataa\n"
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n"
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n"
@@ -6049,12 +6044,12 @@ msgstr ""
 "Epäkelpo allekirjoitus avaimelta %08lX oletettavasti johtuen tuntemattomasta "
 "\"critical bit\":istä\n"
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "avain %08lX: ei vastaavaa aliavainta aliavaimen mitätöintipaketille\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "avain %08lX: ei aliavainta aliavaimen liitosallekirjoitukselle\n"
@@ -6549,17 +6544,28 @@ msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "olet löytänyt ohjelmistovian ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr "lisätietoja osoitteesta http://www.gnupg.org/faq.html\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
@@ -6830,16 +6836,16 @@ msgid ""
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7047,7 +7053,7 @@ msgstr ""
 msgid "[Error - invalid DN]"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7369,40 +7375,40 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 #, fuzzy
 msgid "key generation is not available from the commandline\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, fuzzy, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
@@ -7426,7 +7432,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -7499,7 +7505,7 @@ msgstr "virhe: sormenjälki on väärä\n"
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7510,13 +7516,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7589,128 +7595,128 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "rivi on liian pitkä\n"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NIMI|käytä salasanoihin salausalgoritmia NIMI"
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr ""
 
@@ -7750,21 +7756,21 @@ msgid ""
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 #, fuzzy
 msgid "Component not found"
 msgstr "julkista avainta ei löydy"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 #, fuzzy
 msgid "No argument allowed"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
@@ -7823,119 +7829,119 @@ msgid ""
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "tiedostoa %s ei voi avata: %s\n"
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "etäohjelman suorittamista ei tueta\n"
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr ""
 
@@ -7944,6 +7950,11 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
+#, fuzzy
+#~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
+#~ msgstr ""
+#~ "Oikeudet eivät ole turvallisia, salainlaajennuksia \"%s\" ei ladattu\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA vaatii 160-bittisen tiivistealgoritmin käyttöä\n"
 
@@ -8214,9 +8225,6 @@ msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 #~ msgid "WARNING: using insecure memory!\n"
 #~ msgstr "VAROITUS: käytetään suojaamatonta muistia!\n"
 
-#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
-#~ msgstr "lisätietoja osoitteesta http://www.gnupg.org/faq.html\n"
-
 #~ msgid "operation is not possible without initialized secure memory\n"
 #~ msgstr "toiminto on mahdollinen vain, jos suojattu muisti alustetaan\n"
 
diff --git a/po/fr.po b/po/fr.po
index 68f2b12de..45de9e410 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+0200\n"
 "PO-Revision-Date: 2005-06-28 00:24+0200\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -19,59 +19,59 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "impossible de stocker l'empreinte: %s\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 #, fuzzy
 msgid "PIN too long"
 msgstr "ligne trop longue"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "ligne trop longue"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 #, fuzzy
 msgid "Bad PIN"
 msgstr "mauvais entier en pr�cision multiple (MPI)"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "mauvaise phrase de passe"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 #, fuzzy
 msgid "Passphrase"
 msgstr "mauvaise phrase de passe"
@@ -81,7 +81,7 @@ msgstr "mauvaise phrase de passe"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "le hachage de protection %d n'est pas support�\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
@@ -90,12 +90,12 @@ msgstr "impossible de cr�er `%s': %s\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
@@ -198,13 +198,13 @@ msgstr ""
 "secr�te.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "changer la phrase de passe"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr ""
 
@@ -213,7 +213,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "changer la phrase de passe"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -224,106 +224,106 @@ msgstr ""
 "Options:\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "bavard"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "lire les options de `%s'\n"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "chercher les cl�s avec un serveur de cl�s"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 #, 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:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "mettre la base de confiance � jour"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 #, fuzzy
@@ -332,140 +332,140 @@ msgstr ""
 "Signaler toutes anomalies � <[email protected]> (en anglais)\n"
 "et tout probl�me de traduction � <[email protected]>.\n"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, 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:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erreur pendant la cr�ation de `%s': %s\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, 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:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, 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:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "�criture de la cl� secr�te dans `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "r�pertoire `%s' cr��\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) �chou� dans %s: %s\n"
 
-#: agent/gpg-agent.c:1359
+#: agent/gpg-agent.c:1358
 #, 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:1461
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1466
+#: agent/gpg-agent.c:1465
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483
+#: agent/gpg-agent.c:1482
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1488
+#: agent/gpg-agent.c:1487
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, 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:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignor�: %s\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 #, 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:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 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:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "le protocole gpg-agent version %d n'est pas support�\n"
@@ -492,80 +492,80 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 #, fuzzy
 msgid "Passphrase:"
 msgstr "mauvaise phrase de passe"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 #, fuzzy
 msgid "cancelled\n"
 msgstr "annul�"
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "erreur dans `%s': %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "les parties secr�tes ne sont pas disponibles\n"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "erreur de lecture dans `%s': %s\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -578,7 +578,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -588,7 +588,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr ""
 
@@ -600,19 +600,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 #, fuzzy
 msgid "Yes"
 msgstr "oui"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr ""
 
@@ -658,44 +658,44 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "erreur pendant la cr�ation de `%s': %s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 #, fuzzy
 msgid "host not found"
 msgstr "[Nom utilisateur introuvable]"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent n'est pas disponible dans cette session\n"
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossible de se connecter � `%s': %s\n"
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "annul� par l'utilisateur\n"
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "probl�me avec l'agent - arr�t d'utilisation de l'agent\n"
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossible d'emp�cher la g�n�ration de fichiers �core�: %s\n"
@@ -872,11 +872,11 @@ msgstr "ATTENTION: des donn�es de notation invalides ont �t� d�tect�es\n"
 msgid "not human readable"
 msgstr "illisible par un humain"
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1174,7 +1174,7 @@ 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:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
@@ -1746,69 +1746,69 @@ msgstr "Hachage: "
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "aucun signe = trouv� dans la d�finition du groupe `%s'\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire personnel `%s' est\n"
 "peu s�r\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du fichier de configuration `%s'\n"
 "est peu s�r\n"
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire de l'extension `%s' est peu\n"
 "s�r\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire personnel `%s'\n"
 "sont peu s�res\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du fichier de configuration\n"
 "`%s' sont peu s�res\n"
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions de l'extension `%s' sont\n"
 "peu s�res\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour le r�pertoire personnel `%s'\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1816,21 +1816,21 @@ msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour le fichier de configuration `%s'\n"
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour l'extension `%s'\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
 "r�pertoire personnel `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1838,489 +1838,482 @@ msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
 "fichier de configuration `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant\n"
 "l'extension `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "�l�ment de configuration `%s' inconnu\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr ""
 "passer de la liste des cl�s secr�tes � celle des cl�s priv�es\n"
 "et inversement"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTE: l'ancien fichier d'options par d�faut `%s' a �t� ignor�\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, 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:2266
-#, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr ""
-"l'extension de chiffrement `%s' n'a pas �t� charg�e car ses\n"
-"permissions sont peu s�res\n"
-
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, 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:2515
+#: g10/gpg.c:2492
 #, 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:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2527
 #, 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:2553
+#: g10/gpg.c:2530
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: options d'import invalides\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 msgid "invalid import options\n"
 msgstr "options d'import invalides\n"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 msgid "invalid export options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: options de liste invalides\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 msgid "invalid list options\n"
 msgstr "options de liste invalides\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 #, 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:2605
+#: g10/gpg.c:2582
 #, 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:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 #, 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:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 msgid "invalid verify options\n"
 msgstr "options de v�rification invalides\n"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, 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:2804
+#: g10/gpg.c:2781
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, 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:2938
+#: g10/gpg.c:2915
 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:2944
+#: g10/gpg.c:2921
 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:2950
+#: g10/gpg.c:2927
 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:2963
+#: g10/gpg.c:2940
 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:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression s�lectionn� est invalide\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3041
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/gpg.c:3066
+#: g10/gpg.c:3043
 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:3068
+#: g10/gpg.c:3045
 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:3070
+#: g10/gpg.c:3047
 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:3073
+#: g10/gpg.c:3050
 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:3077
+#: g10/gpg.c:3054
 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:3084
+#: g10/gpg.c:3061
 msgid "invalid default preferences\n"
 msgstr "pr�f�rences par d�faut invalides\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 msgid "invalid personal cipher preferences\n"
 msgstr "pr�f�rences de chiffrement personnelles invalides\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 msgid "invalid personal digest preferences\n"
 msgstr "pr�f�rences de hachage personnelles invalides\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 msgid "invalid personal compress preferences\n"
 msgstr "pr�f�rences de compression personnelles invalides\n"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne marche pas encore avec %s\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, 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:3186
+#: g10/gpg.c:3163
 #, 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:3191
+#: g10/gpg.c:3168
 #, 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:3283
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/gpg.c:3294
+#: g10/gpg.c:3271
 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:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "le chiffrement sym�trique de `%s' a �chou�: %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 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:3352
+#: g10/gpg.c:3329
 #, 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:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 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:3403
+#: g10/gpg.c:3380
 #, 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:3423
+#: g10/gpg.c:3400
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, 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:3579
+#: g10/gpg.c:3556
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'export de la cl� a �chou�: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, 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:3600
+#: g10/gpg.c:3577
 #, 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:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donn�e est invalide\n"
 
-#: g10/gpg.c:4184
+#: g10/gpg.c:4161
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donn�e est invalide\n"
 
-#: g10/gpg.c:4217
+#: g10/gpg.c:4194
 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"
 
@@ -5224,103 +5217,103 @@ msgstr "signature d'un ancien style (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat de `%s' �chou� dans %s: %s\n"
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) �chou� dans %s: %s\n"
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr ""
 "AVERTISSEMENT: utilisation de l'algorithme exp�rimental � cl�\n"
 "publique %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr ""
 "AVERTISSEMENT: utilisation de l'algorithme exp�rimental de chiffrement\n"
 "%s\n"
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr ""
 "AVERTISSEMENT: utilisation de l'algorithme de hachage\n"
 "exp�rimental %s\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVERTISSEMENT: l'algorithme de hachage %s est d�conseill�\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "le module de chiffrement IDEA n'est pas pr�sent\n"
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "voir http://www.gnupg.org/fr/faq.html pour plus d'informations\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: option d�conseill�e \"%s\"\n"
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTISSEMENT: \"%s\" est une option d�conseill�e.\n"
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "utilisez \"%s%s\" � la place\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "AVERTISSEMENT: \"%s\" est une commande d�conseill�e - ne\n"
 "l'utilisez pas\n"
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVERTISSEMENT: \"%s\" est une option d�conseill�e.\n"
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 msgid "Uncompressed"
 msgstr "Non-compress�"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 msgid "uncompressed|none"
 msgstr "noncompress�|non"
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "ce message ne sera pas utilisable par %s\n"
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "option ambigu� `%s'\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "option `%s' inconnue\n"
@@ -5379,12 +5372,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un sous-paquet de type %d poss�de un bit critique\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cl� principale %s)"
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5396,24 +5389,24 @@ msgstr ""
 "\"%.*s\"\n"
 "cl� %u bits %s, ID %s, cr��e %s%s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 msgid "Repeat passphrase\n"
 msgstr "R�p�tez la phrase de passe\n"
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 msgid "Enter passphrase\n"
 msgstr "Entrez la phrase de passe\n"
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr "annul� par l'utilisateur\n"
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "probl�me avec l'agent - arr�t d'utilisation de l'agent\n"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5422,12 +5415,12 @@ msgstr ""
 "Vous avez besoin d'une phrase de passe pour d�verrouiller la\n"
 "cl� secr�te pour l'utilisateur: � %s �\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "cl� de %u bits %s, ID %s, cr��e le %s"
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "        (sous-cl� de la cl� principale ID %s)"
@@ -5769,28 +5762,28 @@ msgstr ""
 "les donn�es ne sont pas enregistr�es; utilisez l'option �--output� pour\n"
 "les enregistrer\n"
 
-#: g10/plaintext.c:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr "Signature d�tach�e.\n"
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr "Entrez le nom du fichier de donn�es: "
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr "lecture de l'entr�e standard...\n"
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr "pas de donn�es sign�es\n"
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
@@ -6061,12 +6054,12 @@ msgstr ""
 "la signature de la cl� %s est suppos�e �tre fausse car un bit\n"
 "critique est inconnu\n"
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "cl� %s: pas de sous-cl� pour la signature de r�vocation de sous-cl�\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
@@ -6579,17 +6572,28 @@ msgstr "impossible d'ouvrir `%s': %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vous avez trouv� un bug... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "erreur pendant la lecture de `%s': %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr "voir http://www.gnupg.org/fr/faq.html pour plus d'informations\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "renommer `%s' en `%s' a �chou�: %s \n"
@@ -6860,16 +6864,16 @@ msgid ""
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7077,7 +7081,7 @@ msgstr ""
 msgid "[Error - invalid DN]"
 msgstr "Erreur: r�ponse invalide.\n"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7413,40 +7417,40 @@ msgstr ""
 "signer, v�rifier, chiffrer ou d�chiffrer\n"
 "l'op�ration par d�faut d�pend des donn�es entr�es\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "utilisation: gpg [options] "
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "impossible de se connecter � `%s': %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "impossible d'acc�der � `%s': %s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 #, fuzzy
 msgid "key generation is not available from the commandline\n"
 msgstr "gpg-agent n'est pas disponible dans cette session\n"
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, fuzzy, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "S�lectionnez le type de cl� � g�n�rer:\n"
@@ -7470,7 +7474,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
@@ -7547,7 +7551,7 @@ msgstr "Erreur: empreinte mal format�e.\n"
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7558,13 +7562,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7637,129 +7641,129 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "ligne trop longue"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "option `%s' inconnue\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "la lecture de la cl� publique a �chou�: %s\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr ""
 "erreur pendant la recherche de l'enregistrement de confiance\n"
 "dans `%s': %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr ""
 
@@ -7799,21 +7803,21 @@ msgid ""
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "utilisation: gpg [options] "
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 #, fuzzy
 msgid "Component not found"
 msgstr "cl� publique non trouv�e"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Les commandes d'administration ne sont pas permises\n"
@@ -7872,119 +7876,119 @@ msgid ""
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "fstat de `%s' �chou� dans %s: %s\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "impossible de cr�er le r�pertoire `%s': %s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "erreur dans `%s': %s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "aucun programme d'ex�cution distante n'est support�\n"
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "la suppression du bloc de cl�s a �chou� : %s\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "impossible de cr�er le fichier de sauvegarde `%s': %s\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "impossible de cr�er le fichier de sauvegarde `%s': %s\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr ""
 
@@ -7993,6 +7997,11 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "le hachage de protection %d n'est pas support�\n"
 
+#~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
+#~ msgstr ""
+#~ "l'extension de chiffrement `%s' n'a pas �t� charg�e car ses\n"
+#~ "permissions sont peu s�res\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr ""
 #~ "DSA n�cessite l'utilisation d'un algorithme de hachage de 160 bits\n"
@@ -8290,9 +8299,6 @@ msgstr "le hachage de protection %d n'est pas support�\n"
 #~ msgid "WARNING: using insecure memory!\n"
 #~ msgstr "AVERTISSEMENT: l'utilisation de la m�moire n'est pas s�re !\n"
 
-#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
-#~ msgstr "voir http://www.gnupg.org/fr/faq.html pour plus d'informations\n"
-
 #~ msgid "operation is not possible without initialized secure memory\n"
 #~ msgstr ""
 #~ "l'op�ration n'est pas possible tant que la m�moire s�re n'est pas\n"
diff --git a/po/gl.po b/po/gl.po
index bbdf4ed5d..b25e97f6e 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+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"
@@ -14,59 +14,59 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 #, fuzzy
 msgid "PIN too long"
 msgstr "li�a longa de m�is\n"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "contrasinal demasiado longo\n"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter non v�lido no nome\n"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI err�neo"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "contrasinal err�neo"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 #, fuzzy
 msgid "Passphrase"
 msgstr "contrasinal err�neo"
@@ -76,7 +76,7 @@ msgstr "contrasinal err�neo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
@@ -85,12 +85,12 @@ msgstr "non se pode crear `%s': %s\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
@@ -190,13 +190,13 @@ msgstr ""
 "Necesita un contrasinal para protexe-la s�a chave secreta.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -216,106 +216,106 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "lareto"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "ser un pouqui�o m�is calado"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 #, 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:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualiza-la base de datos de confianza"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 #, fuzzy
@@ -324,138 +324,138 @@ 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:250
+#: agent/gpg-agent.c:251
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, 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:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directorio creado\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, 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:1359
+#: agent/gpg-agent.c:1358
 #, 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:1461
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1466
+#: agent/gpg-agent.c:1465
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483
+#: agent/gpg-agent.c:1482
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1488
+#: agent/gpg-agent.c:1487
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves omitidas\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 #, 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:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
 
-#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "a versi�n %d do protocolo de gpg-agent non est� soportada\n"
@@ -482,80 +482,80 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 #, fuzzy
 msgid "Passphrase:"
 msgstr "contrasinal err�neo"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancelar"
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "hai partes da chave secreta non dispo�ibles\n"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "erro de lectura: %s\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -568,7 +568,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -578,7 +578,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr ""
 
@@ -590,19 +590,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 #, fuzzy
 msgid "Yes"
 msgstr "si|sim"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr ""
 
@@ -646,45 +646,45 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 #, fuzzy
 msgid "host not found"
 msgstr "%s: usuario non atopado\n"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "non se puido conectar a `%s': %s\n"
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr "problema de comunicaci�n con gpg-agent\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "cancelado polo usuario\n"
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "non � posible deshabilita-los volcados de 'core': %s\n"
@@ -861,11 +861,11 @@ msgstr "AVISO: atop�ronse datos de notaci�n non v�lidos\n"
 msgid "not human readable"
 msgstr "non lexible por humanos"
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1183,7 +1183,7 @@ msgstr "Comando incorrecto (tente \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "non se puido abrir `%s'\n"
@@ -1751,550 +1751,544 @@ msgstr "Hash: "
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "non se atopou un signo = na definici�n do grupo \"%s\"\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "amosar en que chaveiro est� unha chave listada"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: ign�rase o antigo ficheiro de opci�ns por defecto `%s'\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s non � para uso normal!\n"
 
-#: g10/gpg.c:2266
-#, fuzzy, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr ""
-"non se cargou a extensi�n de cifrado \"%s\" debido a permisos inseguros\n"
-
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, 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:2515
+#: g10/gpg.c:2492
 #, 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:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2527
 #, 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:2553
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 msgid "invalid import options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 msgid "invalid export options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, 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:2583
+#: g10/gpg.c:2560
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2582
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, 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:2623
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/gpg.c:2804
+#: g10/gpg.c:2781
 #, 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:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, 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:2938
+#: g10/gpg.c:2915
 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:2944
+#: g10/gpg.c:2921
 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:2950
+#: g10/gpg.c:2927
 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:2963
+#: g10/gpg.c:2940
 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:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3041
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/gpg.c:3066
+#: g10/gpg.c:3043
 #, 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:3068
+#: g10/gpg.c:3045
 #, 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:3070
+#: g10/gpg.c:3047
 #, 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:3073
+#: g10/gpg.c:3050
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3054
 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:3084
+#: g10/gpg.c:3061
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non v�lidas\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non v�lidas\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non v�lidas\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresi�n personais non v�lidas\n"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�%s a�nda non traballa con %s!\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, 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:3186
+#: g10/gpg.c:3163
 #, 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:3191
+#: g10/gpg.c:3168
 #, 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:3283
+#: g10/gpg.c:3260
 #, 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:3294
+#: g10/gpg.c:3271
 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:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3329
 #, 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:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3380
 #, 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:3423
+#: g10/gpg.c:3400
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3556
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportaci�n da chave fallou: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 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:4184
+#: g10/gpg.c:4161
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:4217
+#: g10/gpg.c:4194
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
@@ -5215,99 +5209,99 @@ msgstr "Sinatura � vello estilo (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z incorrecto detectado en proc_tree()\n"
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr ""
 "a actualizaci�n da base de datos de confianza fallou:\n"
 "%s\n"
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "non � posible manexa-lo algoritmo de chave p�blica %d\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo de cifrado non implementado"
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "o plugin de cifra IDEA non est� presente\n"
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = amosar m�is informaci�n\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opci�n a extinguir \"%s\"\n"
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "empregue \"%s%s\" no seu canto\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 msgid "Uncompressed"
 msgstr "Sen comprimir"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Sen comprimir"
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "esta mensaxe pode non ser utilizable por %s\n"
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
@@ -5365,12 +5359,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un subpaquete de tipo %d ten o bit cr�tico posto\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5381,24 +5375,24 @@ msgstr ""
 "\"%.*s\"\n"
 "Chave de %u bits, %s, ID %08lX, creada o %s%s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 msgid "Repeat passphrase\n"
 msgstr "Repita o contrasinal\n"
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 msgid "Enter passphrase\n"
 msgstr "Introduza o contrasinal\n"
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr "cancelado polo usuario\n"
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5408,12 +5402,12 @@ msgstr ""
 "Necesita un contrasinal para desbloquea-la chave secreta para\n"
 "o usuario \""
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bits, chave %s, ID %08lX, creada %s"
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5757,28 +5751,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:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr "Sinatura non adxunta.\n"
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr "Por favor, introduza o nome do ficheiro de datos: "
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr "lendo de stdin ...\n"
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr "non hai datos asinados\n"
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "non foi posible abri-los datos asinados `%s'\n"
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "non foi posible abri-los datos asinados `%s'\n"
@@ -6047,14 +6041,14 @@ msgstr ""
 "asumindo unha sinatura incorrecta da chave %08lX debido a un bit cr�tico "
 "desco�ecido\n"
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "chave %08lX: non hai unha sub-chave para o paquete de a revocaci�n de "
 "subchave\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "chave %08lX: non hai sub-chave para a sinatura da ligaz�n da chave\n"
@@ -6548,17 +6542,28 @@ msgstr "non se puido abrir `%s': %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "atopou un erro ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "erro lendo `%s': %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr "mire en http://www.gnupg.org/faq.html para obter m�is informaci�n\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "non se puido abrir un ficheiro: %s\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
@@ -6829,16 +6834,16 @@ msgid ""
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7055,7 +7060,7 @@ msgstr ""
 msgid "[Error - invalid DN]"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7377,40 +7382,40 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "non se puido conectar a `%s': %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 #, fuzzy
 msgid "key generation is not available from the commandline\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, fuzzy, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
@@ -7434,7 +7439,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro lendo `%s': %s\n"
@@ -7507,7 +7512,7 @@ msgstr "erro: pegada dactilar non v�lida\n"
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7518,13 +7523,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7597,129 +7602,129 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "li�a longa de m�is\n"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "habilitar depuraci�n total"
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME para os contrasinais"
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr ""
 
@@ -7759,21 +7764,21 @@ msgid ""
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 #, fuzzy
 msgid "Component not found"
 msgstr "non se atopou a chave p�blica"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 #, fuzzy
 msgid "No argument allowed"
 msgstr "gravando a chave secreta en `%s'\n"
@@ -7832,121 +7837,121 @@ msgid ""
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr ""
 "a actualizaci�n da base de datos de confianza fallou:\n"
 "%s\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "non se puido abrir %s: %s\n"
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "non se soporta a execuci�n remota de programas\n"
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, fuzzy, c-format
 msgid "could not fork: %s\n"
 msgstr "%s: non se atopou o usuario: %s\n"
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr ""
 
@@ -7955,6 +7960,11 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 
+#, fuzzy
+#~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
+#~ msgstr ""
+#~ "non se cargou a extensi�n de cifrado \"%s\" debido a permisos inseguros\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA require o emprego dun algoritmo hash de 160 bits\n"
 
@@ -8237,9 +8247,6 @@ msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 #~ msgid "WARNING: using insecure memory!\n"
 #~ msgstr "AVISO: ��sase memoria insegura!\n"
 
-#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
-#~ msgstr "mire en http://www.gnupg.org/faq.html para obter m�is informaci�n\n"
-
 #~ msgid "operation is not possible without initialized secure memory\n"
 #~ msgstr "a operaci�n non � posible sen memoria inicializada como segura\n"
 
diff --git a/po/hu.po b/po/hu.po
index c88c12ae7..fd0e9cec9 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+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"
@@ -14,59 +14,59 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 #, fuzzy
 msgid "PIN too long"
 msgstr "A sor t�l hossz�!\n"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "A jelsz� t�l hossz�!\n"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "�rv�nytelen karakter a n�vben!\n"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 #, fuzzy
 msgid "Bad PIN"
 msgstr "hib�s MPI"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "rossz jelsz�"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 #, fuzzy
 msgid "Passphrase"
 msgstr "rossz jelsz�"
@@ -76,7 +76,7 @@ msgstr "rossz jelsz�"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
@@ -85,12 +85,12 @@ msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
@@ -189,13 +189,13 @@ msgstr ""
 "Most sz�ks�g van egy jelsz�ra (vagy mondatra), amely a titkos kulcs�t v�di.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -215,242 +215,242 @@ msgstr ""
 "Opci�k:\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "b�besz�d� m�d"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "m�g sz�kszav�bb m�d"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|f�jl|b�v�t� modul bet�lt�se"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "kulcsok keres�se kulcsszerveren"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 #, 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:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "bizalmi adatb�zis friss�t�se"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "A hib�kat (angolul) a <[email protected]> c�mre �rja meg!\n"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 #, 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:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, 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:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, 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:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, 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:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: K�nyvt�rat l�trehoztam.\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, 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:1359
+#: agent/gpg-agent.c:1358
 #, 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:1461
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1466
+#: agent/gpg-agent.c:1465
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483
+#: agent/gpg-agent.c:1482
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1488
+#: agent/gpg-agent.c:1487
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
 
-#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: kihagyva: %s\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 #, 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:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 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:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
@@ -477,80 +477,80 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 #, fuzzy
 msgid "Passphrase:"
 msgstr "rossz jelsz�"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 #, fuzzy
 msgid "cancelled\n"
 msgstr "M�gsem"
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "Titkos kulcsr�szek nem �llnak rendelkez�sre.\n"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "Olvas�si hiba: %s.\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -563,7 +563,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -573,7 +573,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr ""
 
@@ -585,19 +585,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 #, fuzzy
 msgid "Yes"
 msgstr "igen"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr ""
 
@@ -641,45 +641,45 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 #, fuzzy
 msgid "host not found"
 msgstr "[ismeretlen kulcs]"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr "Kommunik�ci�s probl�ma a gpg �gyn�kkel!\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "Nem tudom letiltani a core f�jlokat: %s.\n"
@@ -855,11 +855,11 @@ msgstr "FIGYELEM: �rv�nytelen jel�l� adatot tal�ltam.\n"
 msgid "not human readable"
 msgstr "nem olvashat� forma"
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1177,7 +1177,7 @@ 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:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
@@ -1738,547 +1738,542 @@ msgstr "Kivonatol� (hash): "
 msgid "Compression: "
 msgstr "T�m�r�t� (compression): "
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "Nem tal�ltam = jelet a \"%s\" csoportdefin�ci�ban!\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mutatja a kilist�zott kulcs kulcskarik�j�t is"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MEGJEGYZ�S: Figyelmen k�v�l hagytam a r�gi opci�kat (%s).\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, 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:2266
-#, fuzzy, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr "A \"%s\" rejtjelez� b�v�t�st rossz enged�lyek miatt t�lt�m be.\n"
-
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 msgid "invalid import options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 msgid "invalid export options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 #, 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:2605
+#: g10/gpg.c:2582
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, 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:2804
+#: g10/gpg.c:2781
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �rtelmetlen %s mellett!\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, 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:2938
+#: g10/gpg.c:2915
 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:2944
+#: g10/gpg.c:2921
 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:2950
+#: g10/gpg.c:2927
 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:2963
+#: g10/gpg.c:2940
 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:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3041
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
 
-#: g10/gpg.c:3066
+#: g10/gpg.c:3043
 #, 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:3068
+#: g10/gpg.c:3045
 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:3070
+#: g10/gpg.c:3047
 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:3073
+#: g10/gpg.c:3050
 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:3077
+#: g10/gpg.c:3054
 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:3084
+#: g10/gpg.c:3061
 msgid "invalid default preferences\n"
 msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 msgid "invalid personal cipher preferences\n"
 msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 msgid "invalid personal digest preferences\n"
 msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 msgid "invalid personal compress preferences\n"
 msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, 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:3181
+#: g10/gpg.c:3158
 #, 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:3186
+#: g10/gpg.c:3163
 #, 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:3191
+#: g10/gpg.c:3168
 #, 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:3283
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/gpg.c:3294
+#: g10/gpg.c:3271
 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:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [f�jln�v]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [f�jln�v]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [f�jln�v]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3329
 #, 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:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [f�jln�v]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3380
 #, 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:3423
+#: g10/gpg.c:3400
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [f�jln�v]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [f�jln�v]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [f�jln�v]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonos�t�"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonos�t� [parancsok]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3556
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexport�l�s sikertelen: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[f�jln�v]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti g�pelni az �zenetet...\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 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:4184
+#: g10/gpg.c:4161
 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:4217
+#: g10/gpg.c:4194
 #, 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"
@@ -5188,98 +5183,98 @@ msgstr "R�gi st�lus� (PGP 2.x) al��r�s.\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�rv�nytelen gy�k�rcsomagot tal�ltam a proc_tree() f�ggv�nyben!\n"
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "Nem tudom kezelni a(z) %d. sz�m� nyilv�nos kulcs� algoritmust!\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "nem megval�s�tott rejtjelez� algoritmus"
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
 "a c�mzett preferenci�ival.\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "Az IDEA rejtjelez� b�v�t�s nincs jelen!\n"
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = tov�bbi inform�ci�kat k�rek\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: Elavult opci�: \"%s\"\n"
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "K�rem, ezt haszn�lja helyette: \"%s%s\"\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 msgid "Uncompressed"
 msgstr "t�m�r�tetlen"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "t�m�r�tetlen"
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "Lehet, hogy ez az �zenet haszn�lhatatlan a %s sz�m�ra!\n"
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
@@ -5338,14 +5333,14 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "A %d t�pus� alcsomag kritikus bitje be�ll�tott.\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr ""
 " \n"
 "  (f� kulcsazonos�t�: %08lX)"
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5357,24 +5352,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u bites %s key, azonos�t�: %08lX, l�trehozva: %s%s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 msgid "Repeat passphrase\n"
 msgstr "Ism�telje meg a jelsz�t!\n"
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 msgid "Enter passphrase\n"
 msgstr "�rja be a jelsz�t!\n"
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5385,12 +5380,12 @@ msgstr ""
 "haszn�lat�hoz:\n"
 "\""
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u bites %s kulcs, azonos�t�: %08lX, l�trehozva: %s."
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5731,28 +5726,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:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr "K�l�n�ll� al��r�s.\n"
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr "K�rem, adja meg az adat�llom�ny nev�t: "
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr "Olvasom a szabv�nyos bemenetet...\n"
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr "Nincs al��rt adat.\n"
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" al��rt adatot!\n"
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" al��rt adatot!\n"
@@ -6015,12 +6010,12 @@ msgstr ""
 "Rossz al��r�st felt�telezek a %08lX kulcst�l egy ismeretlen\n"
 "kritikus bit miatt.\n"
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "%08lX kulcs: Nincs alkulcs az alkulcsvisszavon� csomaghoz.\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "%08lX kulcs: Nincs alkulcs az alkulcsk�t� al��r�shoz!\n"
@@ -6512,17 +6507,28 @@ msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Tal�lt egy programhib�t... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr "Tov�bbi inform�ci� a http://www.gnupg.org/faq.html c�men tal�lhat�.\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
@@ -6791,16 +6797,16 @@ msgid ""
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7008,7 +7014,7 @@ msgstr ""
 msgid "[Error - invalid DN]"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7331,40 +7337,40 @@ msgstr ""
 "Al��r�s, ellen�rz�s, titkos�t�s vagy visszafejt�s.\n"
 "Az alap�rtelmezett m�velet a bemeneti adatt�l f�gg.\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 #, fuzzy
 msgid "key generation is not available from the commandline\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, fuzzy, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
@@ -7388,7 +7394,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@ -7461,7 +7467,7 @@ msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7472,13 +7478,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7551,128 +7557,128 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "A sor t�l hossz�!\n"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "Al��r�s sikertelen: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|N�V|N�V rejtjelez� algoritmus haszn. jelszavakhoz"
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr ""
 
@@ -7712,21 +7718,21 @@ msgid ""
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 #, fuzzy
 msgid "Component not found"
 msgstr "nyilv�nos kulcs nem tal�lhat�"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 #, fuzzy
 msgid "No argument allowed"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
@@ -7785,119 +7791,119 @@ msgid ""
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "Nem tudom megnyitni %s-t: %s\n"
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "K�ls� program megh�v�sa nem t�mogatott.\n"
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr ""
 
@@ -7906,6 +7912,10 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 
+#, fuzzy
+#~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
+#~ msgstr "A \"%s\" rejtjelez� b�v�t�st rossz enged�lyek miatt t�lt�m be.\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "A DSA 160 bites hash (kivonatol�) algoritmust ig�nyel.\n"
 
@@ -8176,10 +8186,6 @@ msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 #~ msgid "WARNING: using insecure memory!\n"
 #~ msgstr "FIGYELEM: Nem biztons�gos mem�ri�t haszn�lunk!\n"
 
-#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
-#~ msgstr ""
-#~ "Tov�bbi inform�ci� a http://www.gnupg.org/faq.html c�men tal�lhat�.\n"
-
 #~ msgid "operation is not possible without initialized secure memory\n"
 #~ msgstr "A m�velet nem lehets�ges biztons�gos mem�ria n�lk�l.\n"
 
diff --git a/po/id.po b/po/id.po
index f504dfb19..41170b3cc 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+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"
@@ -16,59 +16,59 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 #, fuzzy
 msgid "PIN too long"
 msgstr "baris terlalu panjang\n"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "passphrase terlalu panjang\n"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI yang buruk"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "passphrase yang buruk"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 #, fuzzy
 msgid "Passphrase"
 msgstr "passphrase yang buruk"
@@ -78,7 +78,7 @@ msgstr "passphrase yang buruk"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
@@ -87,12 +87,12 @@ msgstr "tidak dapat membuat %s: %s\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
@@ -191,13 +191,13 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "ubah passphrase"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "ubah passphrase"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -217,242 +217,242 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "detil"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cari kunci di key server"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "perbarui database trust"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Laporkan bug ke <[email protected]>.\n"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: direktori tercipta\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1359
+#: agent/gpg-agent.c:1358
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: tidak dapat membuat direktori: %s\n"
 
-#: agent/gpg-agent.c:1461
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1466
+#: agent/gpg-agent.c:1465
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483
+#: agent/gpg-agent.c:1482
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1488
+#: agent/gpg-agent.c:1487
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: dilewati: %s\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 
-#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokol gpg-agent versi %d tidak didukung\n"
@@ -479,80 +479,80 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 #, fuzzy
 msgid "Passphrase:"
 msgstr "passphrase yang buruk"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Batal"
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "bagian kunci rahasia tidak tersedia\n"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -565,7 +565,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -575,7 +575,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr ""
 
@@ -587,19 +587,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 #, fuzzy
 msgid "Yes"
 msgstr "y|ya"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr ""
 
@@ -643,45 +643,45 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 #, fuzzy
 msgid "host not found"
 msgstr "[User id tidak ditemukan]"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr "masalah komunikasi dengan gpg-agent\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "dibatalkan oleh user\n"
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "tidak dapat meniadakan core dump: %s\n"
@@ -858,11 +858,11 @@ msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
 msgid "not human readable"
 msgstr "tidak dapat dibaca manusia"
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1180,7 +1180,7 @@ msgstr "Perintah tidak valid (coba \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
@@ -1740,555 +1740,550 @@ msgstr "Hash: "
 msgid "Compression: "
 msgstr "Kompresi: "
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/gpg.c:2266
-#, fuzzy, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr "ekstensi cipher \"%s\" tidak dimuat karena permisi tidak aman\n"
-
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2582
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/gpg.c:2804
+#: g10/gpg.c:2781
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/gpg.c:2938
+#: g10/gpg.c:2915
 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:2944
+#: g10/gpg.c:2921
 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:2950
+#: g10/gpg.c:2927
 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:2963
+#: g10/gpg.c:2940
 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:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3041
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/gpg.c:3066
+#: g10/gpg.c:3043
 #, 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:3068
+#: g10/gpg.c:3045
 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:3070
+#: g10/gpg.c:3047
 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:3073
+#: g10/gpg.c:3050
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3054
 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:3084
+#: g10/gpg.c:3061
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, 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:3186
+#: g10/gpg.c:3163
 #, 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:3191
+#: g10/gpg.c:3168
 #, 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:3283
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/gpg.c:3294
+#: g10/gpg.c:3271
 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:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3329
 #, 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:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3380
 #, 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:3423
+#: g10/gpg.c:3400
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3556
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4184
+#: g10/gpg.c:4161
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4217
+#: g10/gpg.c:4194
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@ -5199,96 +5194,96 @@ msgstr "signature model lama (PGP 2.X)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritma cipher belum diimplementasikan"
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin cipher IDEA tidak tersedia\n"
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = beri saya informasi lebih banyak lagi\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opsi tidak digunakan lagi \"%s\"\n"
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "silakan gunakan \"%s%s\"\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 msgid "Uncompressed"
 msgstr "Tidak dikompresi"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Tidak dikompresi"
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "pesan ini mungkin tidak dapat digunakan oleh %s\n"
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
@@ -5345,12 +5340,12 @@ msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID kunci utama %08lX)"
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5361,24 +5356,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, tercipta %s%s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 msgid "Repeat passphrase\n"
 msgstr "Ulangi passphrase\n"
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 msgid "Enter passphrase\n"
 msgstr "Masukkan passphrase\n"
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr "dibatalkan oleh user\n"
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5388,12 +5383,12 @@ msgstr ""
 "Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
 "pemakai: \""
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5734,28 +5729,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:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr "Menghapus signature.\n"
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr "Silakan masukkan nama file data: "
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr "membaca stdin ...\n"
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr "tidak ada data tertandai\n"
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "tidak dapat membuka data tertandai `%s'\n"
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "tidak dapat membuka data tertandai `%s'\n"
@@ -6020,12 +6015,12 @@ msgstr ""
 "mengasumsikan signature buruk dari kunci %08lX karena ada bit kritik tidak "
 "dikenal\n"
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "kunci %08lX: tidak ada subkey untuk pembatalan paket\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding signature\n"
@@ -6515,17 +6510,29 @@ msgstr "tidak dapat membuka `%s': %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "anda menemukan kesalahan ...(%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "kesalahan membaca `%s': %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr ""
+"silakan lihat http://www.gnupg.org/faq.html untuk informasi lebih lanjut\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
@@ -6794,16 +6801,16 @@ msgid ""
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7011,7 +7018,7 @@ msgstr ""
 msgid "[Error - invalid DN]"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7333,40 +7340,40 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 #, fuzzy
 msgid "key generation is not available from the commandline\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, fuzzy, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
@@ -7390,7 +7397,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -7463,7 +7470,7 @@ msgstr "kesalahan: fingerprint tidak valid\n"
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7474,13 +7481,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7553,128 +7560,128 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "baris terlalu panjang\n"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr ""
 
@@ -7714,21 +7721,21 @@ msgid ""
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 #, fuzzy
 msgid "Component not found"
 msgstr "kunci publik tidak ditemukan"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 #, fuzzy
 msgid "No argument allowed"
 msgstr "menulis kunci rahasia ke `%s'\n"
@@ -7787,119 +7794,119 @@ msgid ""
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "tidak dapat membuka %s: %s\n"
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "tidak ada eksekusi program remote yang didukung\n"
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr ""
 
@@ -7908,6 +7915,10 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
+#, fuzzy
+#~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
+#~ msgstr "ekstensi cipher \"%s\" tidak dimuat karena permisi tidak aman\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA butuh penggunaan algoritma hash 160 bit\n"
 
@@ -8178,10 +8189,6 @@ msgstr "algoritma proteksi %d%s tidak didukung\n"
 #~ msgid "WARNING: using insecure memory!\n"
 #~ msgstr "Peringatan: menggunakan memori yang tidak aman!\n"
 
-#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
-#~ msgstr ""
-#~ "silakan lihat http://www.gnupg.org/faq.html untuk informasi lebih lanjut\n"
-
 #~ msgid "operation is not possible without initialized secure memory\n"
 #~ msgstr "operasi tidak mungkin tanpa menginisialisasi memori yang aman\n"
 
diff --git a/po/it.po b/po/it.po
index 683020163..654336ce6 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+0200\n"
 "PO-Revision-Date: 2004-06-16 17:01+0200\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -14,59 +14,59 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 #, fuzzy
 msgid "PIN too long"
 msgstr "riga troppo lunga\n"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "passphrase troppo lunga\n"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Carattere non valido nel nome\n"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI danneggiato"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "passphrase errata"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 #, fuzzy
 msgid "Passphrase"
 msgstr "passphrase errata"
@@ -76,7 +76,7 @@ msgstr "passphrase errata"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
@@ -85,12 +85,12 @@ msgstr "impossibile creare `%s': %s\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
@@ -189,13 +189,13 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "cambia la passphrase"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "cambia la passphrase"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -215,242 +215,242 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "prolisso"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cerca delle chiavi su un key server"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aggiorna il database della fiducia"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, 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:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "errore creando `%s': %s\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "impossibile creare la directory `%s': %s\n"
 
-#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directory creata\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1359
+#: agent/gpg-agent.c:1358
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: impossibile creare la directory: %s\n"
 
-#: agent/gpg-agent.c:1461
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1466
+#: agent/gpg-agent.c:1465
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483
+#: agent/gpg-agent.c:1482
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1488
+#: agent/gpg-agent.c:1487
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: saltata: %s\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 
-#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "la versione %d del protocollo di gpg-agent non � gestita\n"
@@ -477,80 +477,80 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 #, fuzzy
 msgid "Passphrase:"
 msgstr "passphrase errata"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancella"
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "parti della chiave segreta non sono disponibili\n"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "errore di lettura: %s\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -563,7 +563,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -573,7 +573,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr ""
 
@@ -585,19 +585,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 #, fuzzy
 msgid "Yes"
 msgstr "si|s�"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr ""
 
@@ -641,45 +641,45 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "errore creando `%s': %s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 #, fuzzy
 msgid "host not found"
 msgstr "[User ID non trovato]"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossibile connettersi a `%s': %s\n"
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr "problema di comunicazione con gpg-agent\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "interrotto dall'utente\n"
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossibile disabilitare i core dump: %s\n"
@@ -856,11 +856,11 @@ msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
 msgid "not human readable"
 msgstr "non leggibile"
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1179,7 +1179,7 @@ msgstr "Comando non valido  (prova \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
@@ -1749,552 +1749,545 @@ msgstr "Hash: "
 msgid "Compression: "
 msgstr "Compressione: "
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "non � stato trovato il segno = nella definizione del gruppo \"%s\"\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 "NOTA: il vecchio file `%s' con le opzioni predefinite � stato ignorato\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/gpg.c:2266
-#, fuzzy, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr ""
-"l'estensione crittografica \"%s\" non � stata caricata a causa dei\n"
-"permessi insicuri.\n"
-
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2582
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/gpg.c:2804
+#: g10/gpg.c:2781
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, 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:2938
+#: g10/gpg.c:2915
 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:2944
+#: g10/gpg.c:2921
 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:2950
+#: g10/gpg.c:2927
 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:2963
+#: g10/gpg.c:2940
 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:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3041
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/gpg.c:3066
+#: g10/gpg.c:3043
 #, 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:3068
+#: g10/gpg.c:3045
 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:3070
+#: g10/gpg.c:3047
 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:3073
+#: g10/gpg.c:3050
 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:3077
+#: g10/gpg.c:3054
 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:3084
+#: g10/gpg.c:3061
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, 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:3186
+#: g10/gpg.c:3163
 #, 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:3191
+#: g10/gpg.c:3168
 #, 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:3283
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/gpg.c:3294
+#: g10/gpg.c:3271
 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:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3329
 #, 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:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3380
 #, 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:3423
+#: g10/gpg.c:3400
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3556
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non � valido\n"
 
-#: g10/gpg.c:4184
+#: g10/gpg.c:4161
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:4217
+#: g10/gpg.c:4194
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
@@ -5220,97 +5213,97 @@ msgstr "firma vecchio stile (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "impossibile aprire il file: %s\n"
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo di cifratura non implementato"
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "il plugin per il cifrario IDEA non � presente\n"
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostrami ulteriori informazioni\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "usa al suo posto \"%s%s\"\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 msgid "Uncompressed"
 msgstr "Non compresso"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Non compresso"
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "questo messaggio pu� non essere utilizzabile da %s\n"
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
@@ -5371,12 +5364,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (key ID principale %08lX)"
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5387,24 +5380,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, created %s%s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 msgid "Repeat passphrase\n"
 msgstr "Ripeti la passphrase\n"
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 msgid "Enter passphrase\n"
 msgstr "Inserisci la passphrase\n"
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr "interrotto dall'utente\n"
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5414,12 +5407,12 @@ msgstr ""
 "Ti serve una passphrase per sbloccare la chiave segreta\n"
 "dell'utente: \""
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5764,28 +5757,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:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr "Firma separata.\n"
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr "Inserisci il nome del file di dati: "
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr "viene letto stdin...\n"
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr "non ci sono dati firmati\n"
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossibile aprire i dati firmati `%s'\n"
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "impossibile aprire i dati firmati `%s'\n"
@@ -6059,14 +6052,14 @@ msgstr ""
 "si suppone una firma non valida della chiave %08lX a causa di un\n"
 "bit critico sconosciuto\n"
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "chiave %08lX: non c'� una subchiave per il pacchetto di revoca della "
 "subchiave\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
@@ -6563,17 +6556,28 @@ msgstr "impossibile aprire `%s': %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "hai trovato un bug... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "errore leggendo `%s': %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr "visitare http://www.gnupg.org/faq.html per ulteriori informazioni\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "impossibile aprire il file: %s\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
@@ -6842,16 +6846,16 @@ msgid ""
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7059,7 +7063,7 @@ msgstr ""
 msgid "[Error - invalid DN]"
 msgstr "errore: impronta digitale non valida\n"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7381,40 +7385,40 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "impossibile connettersi a `%s': %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "impossibile chiudere `%s': %s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 #, fuzzy
 msgid "key generation is not available from the commandline\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, fuzzy, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
@@ -7438,7 +7442,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "errore leggendo `%s': %s\n"
@@ -7511,7 +7515,7 @@ msgstr "errore: impronta digitale non valida\n"
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7522,13 +7526,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7601,128 +7605,128 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "riga troppo lunga\n"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr ""
 
@@ -7762,21 +7766,21 @@ msgid ""
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 #, fuzzy
 msgid "Component not found"
 msgstr "chiave pubblica non trovata"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 #, fuzzy
 msgid "No argument allowed"
 msgstr "scrittura della chiave segreta in `%s'\n"
@@ -7835,119 +7839,119 @@ msgid ""
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "impossibile aprire il file: %s\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "impossibile creare la directory `%s': %s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "l'esecuzione remota dei programmi non � gestita\n"
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr ""
 
@@ -7956,6 +7960,12 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 
+#, fuzzy
+#~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
+#~ msgstr ""
+#~ "l'estensione crittografica \"%s\" non � stata caricata a causa dei\n"
+#~ "permessi insicuri.\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA richiede l'uso di un algoritmo di hashing con almeno 160 bit\n"
 
@@ -8230,9 +8240,6 @@ msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 #~ msgid "WARNING: using insecure memory!\n"
 #~ msgstr "ATTENZIONE: si sta usando memoria insicura!\n"
 
-#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
-#~ msgstr "visitare http://www.gnupg.org/faq.html per ulteriori informazioni\n"
-
 #~ msgid "operation is not possible without initialized secure memory\n"
 #~ msgstr "l'operazione non � possibile senza memoria sicura inizializzata\n"
 
diff --git a/po/ja.po b/po/ja.po
index 135a2c9e3..e51e3a562 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+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"
@@ -17,59 +17,59 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 #, fuzzy
 msgid "PIN too long"
 msgstr "�Ԥ�Ĺ�����ޤ�"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "�ѥ��ե졼����Ĺ�����ޤ�\n"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 #, fuzzy
 msgid "Bad PIN"
 msgstr "������MPI�Ǥ�"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "�ѥ��ե졼���������Ǥ�"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 #, fuzzy
 msgid "Passphrase"
 msgstr "�ѥ��ե졼���������Ǥ�"
@@ -79,7 +79,7 @@ msgstr "�ѥ��ե졼���������Ǥ�"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
@@ -88,12 +88,12 @@ msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
@@ -192,13 +192,13 @@ msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -218,242 +218,242 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "����Ť�"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "�������С��θ��򸡺�����"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "��%s�פκ������顼: %s\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "��%s�פǿ��ѥ쥳���ɤθ������顼: %s\n"
 
-#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ��Ǥ��ޤ���\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d)��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1359
+#: agent/gpg-agent.c:1358
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1461
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1466
+#: agent/gpg-agent.c:1465
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483
+#: agent/gpg-agent.c:1482
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1488
+#: agent/gpg-agent.c:1487
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: �����å�: %s\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
 
-#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
@@ -480,80 +480,80 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 #, fuzzy
 msgid "Passphrase:"
 msgstr "�ѥ��ե졼���������Ǥ�"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 #, fuzzy
 msgid "cancelled\n"
 msgstr "����󥻥�"
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "��%s�פǥ��顼: %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "��̩��ʬ�������ޤ���\n"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -566,7 +566,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -576,7 +576,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr ""
 
@@ -588,19 +588,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 #, fuzzy
 msgid "Yes"
 msgstr "yes"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr ""
 
@@ -644,45 +644,45 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "��%s�פκ������顼: %s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 #, fuzzy
 msgid "host not found"
 msgstr "[�桼����ID�����Ĥ���ޤ���]"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agent�Ȥ��̿��㳲\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "�桼�����ˤ���ä�\n"
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "����������פ���ѶػߤˤǤ��ޤ���: %s\n"
@@ -855,11 +855,11 @@ msgstr "�ٹ�: ̵��������ǡ�����ȯ��\n"
 msgid "not human readable"
 msgstr "�ͤˤ��ɤ�ޤ���"
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1151,7 +1151,7 @@ msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "��%s�פ������ޤ���\n"
@@ -1702,536 +1702,531 @@ msgstr "�ϥå���: "
 msgid "Compression: "
 msgstr "����: "
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "��Ω���륳�ޥ��\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=���椬�����롼�������%s����˸��Ĥ���ޤ���\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "̤�Τι������ܡ�%s��\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s�ϻȤ��ޤ���!\n"
 
-#: g10/gpg.c:2266
-#, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr "�����Ǥʤ����ĤΤ��ᡢ�Ź�ˡ��ĥ��%s�פ�����ɤ��ޤ���\n"
-
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2492
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 msgid "could not parse keyserver URL\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2527
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2530
 msgid "invalid keyserver options\n"
 msgstr "̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 msgid "invalid import options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 msgid "invalid export options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 msgid "invalid list options\n"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2582
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 msgid "invalid verify options\n"
 msgstr "̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/gpg.c:2804
+#: g10/gpg.c:2781
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ�˻ȤäƤ�̵��̣�Ǥ�!\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/gpg.c:2938
+#: g10/gpg.c:2915
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2921
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ沽��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:2927
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/gpg.c:2963
+#: g10/gpg.c:2940
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
 
-#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 msgid "selected compression algorithm is invalid\n"
 msgstr "���򤵤줿���̥��르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3041
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3066
+#: g10/gpg.c:3043
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3045
 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:3070
+#: g10/gpg.c:3047
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "̵����min-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3050
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3054
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3061
 msgid "invalid default preferences\n"
 msgstr "̵���ʴ��������\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 msgid "invalid personal cipher preferences\n"
 msgstr "̵���ʸĿ��ѰŹ�ˡ������\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 msgid "invalid personal digest preferences\n"
 msgstr "̵���ʸĿ������������\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 msgid "invalid personal compress preferences\n"
 msgstr "̵���ʸĿ��Ѱ��̤�����\n"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3186
+#: g10/gpg.c:3163
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3191
+#: g10/gpg.c:3168
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3294
+#: g10/gpg.c:3271
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3329
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3380
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3400
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3556
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å��������ǤäƤ������� ...\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4184
+#: g10/gpg.c:4161
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4217
+#: g10/gpg.c:4194
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
@@ -5058,95 +5053,95 @@ msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() �����̵���ʥ롼�ȡ��ѥ��åȤ򸡽Ф��ޤ���\n"
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "��%s�פ�fstat��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d)��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "�������Υ��르�ꥺ��%d�ϡ���갷���ޤ���\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "̤�����ΰŹ楢�르�ꥺ��Ǥ�"
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA�Ź�ˡ�Υץ饰���󤬤���ޤ���\n"
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "�ܺ٤�http://www.gnupg.org/faq.html������������\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: ����뤵��Ƥ��륪�ץ�����%s��\n"
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "��%s%s�ɤ�����˻ȤäƤ�������\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 msgid "Uncompressed"
 msgstr "̵����"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 msgid "uncompressed|none"
 msgstr "̵����|�ʤ�"
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "���Υ�å������ϡ�%s�Ǥϻ��ѤǤ��ޤ���\n"
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "�����ޤ��ʥ��ץ�����%s��\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "̤�ΤΥ��ץ�����%s��\n"
@@ -5202,12 +5197,12 @@ msgstr "�ٹ�: ����Ū�˷��ݤ��оΰŹ沽���å���󸰤Ǥ�\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (�縰ID %s)"
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5218,24 +5213,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u�ӥå�%s��, ID %s�������դ�%s%s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 msgid "Repeat passphrase\n"
 msgstr "�ѥ��ե졼���������\n"
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 msgid "Enter passphrase\n"
 msgstr "�ѥ��ե졼��������\n"
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr "�桼�����ˤ���ä�\n"
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5244,12 +5239,12 @@ msgstr ""
 "���Υ桼��������̩���Υ��å���������ˤ�\n"
 "�ѥ��ե졼��������ޤ�:��%s��\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u�ӥå�%s��, ID %s�������դ�%s"
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (�縰ID %s ������)"
@@ -5572,28 +5567,28 @@ msgstr ""
 "�ǡ�������¸����Ƥ��ޤ���\n"
 "��¸����ˤϡ�--output�ɥ��ץ�����ȤäƤ�������\n"
 
-#: g10/plaintext.c:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr "ʬΥ��̾��\n"
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr "�ǡ������ե������̾��������: "
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr "ɸ�����Ϥ���ɽФ��� ...\n"
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr "��̾���줿�ǡ���������ޤ���\n"
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "��̾���줿�ǡ�����%s�פ������ޤ���\n"
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "��̾���줿�ǡ�����%s�פ������ޤ���\n"
@@ -5845,12 +5840,12 @@ msgstr "����: ��̾��%s��%s����λ�Ǥ�\n"
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "̤�ΤΥ���ƥ����롦�ӥåȤˤ�ꡢ��%s�ν�̾�������Ȥߤʤ��ޤ�\n"
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "��%s: ����������̾�ˤ�����������������ޤ���\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "��%s: �����б��ؤν�̾�ˤ�����������������ޤ���\n"
@@ -6326,17 +6321,28 @@ msgstr "��%s�פ������ޤ���: %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "�Х���ȯ�� ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "��%s�פ��ɽФ����顼: %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr "�ܺ٤�http://www.gnupg.org/faq.html������������\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "��%s�פ����%s�פؤΰ�ư�˼���: %s\n"
@@ -6599,16 +6605,16 @@ msgid ""
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6816,7 +6822,7 @@ msgstr ""
 msgid "[Error - invalid DN]"
 msgstr "���顼: ̵���ʱ�����\n"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7147,40 +7153,40 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "��%s�פ˥��������Ǥ��ޤ���: %s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 #, fuzzy
 msgid "key generation is not available from the commandline\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, fuzzy, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "�������븰�η������򤷤Ƥ�������:\n"
@@ -7204,7 +7210,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "���֤μ������顼: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
@@ -7277,7 +7283,7 @@ msgstr "���顼: ̵���ʷ����λ��档\n"
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7288,13 +7294,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7367,127 +7373,127 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "�Ԥ�Ĺ�����ޤ�"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "̤�ΤΥ��ץ�����%s��\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "��%s�פǿ��ѥ쥳���ɤθ������顼: %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr ""
 
@@ -7527,21 +7533,21 @@ msgid ""
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 #, fuzzy
 msgid "Component not found"
 msgstr "�����������Ĥ���ޤ���"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 #, fuzzy
 msgid "No argument allowed"
 msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
@@ -7600,119 +7606,119 @@ msgid ""
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "��%s�פ�fstat��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "���ء�%s�פν���ߥ��顼: %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "��%s�פǥ��顼: %s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "��֥ץ������μ¹Ԥϡ����ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "�Хå����åס��ե������%s�פ������Ǥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "�Хå����åס��ե������%s�פ������Ǥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr ""
 
@@ -7721,6 +7727,9 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
+#~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
+#~ msgstr "�����Ǥʤ����ĤΤ��ᡢ�Ź�ˡ��ĥ��%s�פ�����ɤ��ޤ���\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA�Ǥ�160�ӥåȤΥϥå��塦���르�ꥺ��λ��Ѥ�ɬ�פǤ�\n"
 
@@ -8013,9 +8022,6 @@ msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\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"
 
diff --git a/po/nb.po b/po/nb.po
index 32286c1f8..68cf97263 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.3\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+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"
@@ -18,58 +18,58 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 #, fuzzy
 msgid "PIN too long"
 msgstr "for lang linje"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "for lang linje"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Ugyldig tegn i navn\n"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 #, fuzzy
 msgid "Bad PIN"
 msgstr "ugyldig MPI"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "ugyldig passfrase"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 #, fuzzy
 msgid "Passphrase"
 msgstr "ugyldig passfrase"
@@ -79,7 +79,7 @@ msgstr "ugyldig passfrase"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
@@ -88,12 +88,12 @@ msgstr "kan ikke opprette �%s�: %s\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �pne �%s�: %s\n"
@@ -192,13 +192,13 @@ msgstr ""
 "Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "endre passfrasen"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "endre passfrasen"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -218,241 +218,241 @@ msgstr ""
 "Valg:\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "fyldig output"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "v�re noenlunde stille"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "leser valg fra �%s�\n"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "s�ke etter n�kler p� en n�kkelserver"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "sette en notasjon for de valgte brukeridene"
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "ikke oppdat�r tillitsdatabasen etter import"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Vennligst rapporter feil til <[email protected]>.\n"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MERK: ingen standard valgfil �%s�\n"
 
-#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "valgfil �%s�: %s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leser valg fra �%s�\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, 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:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skriver hemmelig n�kkel til �%s�\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen �%s� ble opprettet\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) mislyktes in %s: %s\n"
 
-#: agent/gpg-agent.c:1359
+#: agent/gpg-agent.c:1358
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: agent/gpg-agent.c:1461
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1466
+#: agent/gpg-agent.c:1465
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483
+#: agent/gpg-agent.c:1482
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1488
+#: agent/gpg-agent.c:1487
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "oppdatering av hemmelig mislyktes: %s\n"
 
-#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: hoppet over: %s\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr ""
@@ -479,77 +479,77 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 #, fuzzy
 msgid "Passphrase:"
 msgstr "ugyldig passfrase"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 #, fuzzy
 msgid "cancelled\n"
 msgstr "cancel|cancel"
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "feil med �%s�: %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "valgfil �%s�: %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "hemmelig n�kkel er ikke tilgjengelig"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "lesefeil ved �%s�: %s\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -562,7 +562,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -572,7 +572,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr ""
 
@@ -584,19 +584,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 #, fuzzy
 msgid "Yes"
 msgstr "ja"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr ""
 
@@ -640,42 +640,42 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "feil ved lesing av n�kkelblokk: %s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 #, fuzzy
 msgid "host not found"
 msgstr "[Brukerid ikke funnet]"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr ""
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 msgid "canceled by user\n"
 msgstr ""
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 msgid "problem with the agent\n"
 msgstr ""
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr ""
@@ -846,11 +846,11 @@ msgstr "ingen gyldig OpenPGP-data funnet.\n"
 msgid "not human readable"
 msgstr ""
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1142,7 +1142,7 @@ 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:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �pne �%s�\n"
@@ -1694,57 +1694,57 @@ msgstr "Hash: "
 msgid "Compression: "
 msgstr "Kompresjon: "
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "motstridende kommandoer\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "fant ingen �=�-tegn i gruppedefinisjonen �%s�\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� hjemmekatalogen �%s�\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� utvidelsen �%s�\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� hjemmekatalogen �%s�\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� utvidelsen �%s�\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over hjemmekatalogen �%"
 "s�\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1752,20 +1752,20 @@ msgstr ""
 "ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over konfigurasjonsfilen "
 "�%s�\n"
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over utvidelsen �%s�\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over hjemmekatalogen "
 "�%s�\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1773,461 +1773,456 @@ msgstr ""
 "ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over "
 "konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over utvidelsen �%s�\n"
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukjent konfigurasjonspunkt �%s�\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 msgid "show the keyring name in key listings"
 msgstr "vise navnet til n�kkelknippene i n�kkellister"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MERK: den gamle valgfila �%s� ble ignorert\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MERK: %s er ikke for vanlig bruk!\n"
 
-#: g10/gpg.c:2266
-#, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr "cipherutvidelse �%s� ble ikke lastet p� grunn av utrygge rettigheter\n"
-
 # Tenk litt p� denne du, Trond.
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�%s� er ikke en gyldig signaturutg�else\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2492
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�%s� er ikke et gyldig tegnsett\n"
 
-#: g10/gpg.c:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 msgid "could not parse keyserver URL\n"
 msgstr "kunne ikke parse n�kkelserverens URL\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2527
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2530
 msgid "invalid keyserver options\n"
 msgstr "ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importvalg\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 msgid "invalid import options\n"
 msgstr "ugyldige importvalg\n"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 msgid "invalid export options\n"
 msgstr "ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listevalg\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 msgid "invalid list options\n"
 msgstr "ugyldige listevalg\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 msgid "show all notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2582
 msgid "show user ID validity during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 msgid "invalid verify options\n"
 msgstr "ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunne ikke sette exec-path til %s\n"
 
-#: g10/gpg.c:2804
+#: g10/gpg.c:2781
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overstyrere %s\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s er ikke tillatt sammen med %s!\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er ikke fornuftig med %s!\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2938
+#: g10/gpg.c:2915
 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:2944
+#: g10/gpg.c:2921
 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:2950
+#: g10/gpg.c:2927
 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:2963
+#: g10/gpg.c:2940
 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:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt krypteringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "valg digestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt kompresjonsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt sertifikasjondigestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m� v�re st�rre enn 0\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3041
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-neede m� v�re st�rre enn 1\n"
 
-#: g10/gpg.c:3066
+#: g10/gpg.c:3043
 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:3068
+#: g10/gpg.c:3045
 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:3070
+#: g10/gpg.c:3047
 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:3073
+#: g10/gpg.c:3050
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MERK: enkel S2K-modus (0) er sterkt frar�det\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3054
 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:3084
+#: g10/gpg.c:3061
 msgid "invalid default preferences\n"
 msgstr "ugyldig standard preferanser\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldig personlig cipherpreferanser\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldig personlig digestpreferanser\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldig personlig kompresjonspreferanser\n"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker ikke enn� med %s\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, 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:3186
+#: g10/gpg.c:3163
 #, 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:3191
+#: g10/gpg.c:3168
 #, 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:3283
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3294
+#: g10/gpg.c:3271
 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:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [filnavn]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av �%s� mislyktes: %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnavn]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3329
 #, 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:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [filnavn]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3380
 #, 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:3423
+#: g10/gpg.c:3400
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnavn]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key brukerid"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key brukerid"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key brukerid [kommandoer]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sending til n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "mottak fra n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3556
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "n�kkeleksport mislyktes: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "s�k p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hashalgoritme �%s�\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "Sett i gang og tast inn meldingen din ...\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angitte URLen for sertifikasjonspolicyen er ugyldig\n"
 
-#: g10/gpg.c:4184
+#: g10/gpg.c:4161
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angitte URLen for signaturpolicy er ugyldig\n"
 
-#: g10/gpg.c:4217
+#: g10/gpg.c:4194
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angitte URLen for den foretrukkede n�kkelserveren er ugyldig\n"
 
@@ -4944,95 +4939,95 @@ msgstr ""
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) mislyktes in %s: %s\n"
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "ADVARSEL: bruker eksperimentell offentlig n�kkel-algoritme %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "ADVARSEL: bruker eksperimentell cipheralgoritme %s\n"
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "ADVARSEL: bruker eksperimentell digest-algoritme %s\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ADVARSEL: digestalgoritmen �%s� er avlegs\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "vennligst se %s for mer informasjon\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr ""
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 msgid "Uncompressed"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "flertydig valg �%s�\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "ukjent valg �%s�\n"
@@ -5088,12 +5083,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (hovedn�kkelid %s)"
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5104,24 +5099,24 @@ msgstr ""
 "�%.*s�\n"
 "%u-bit %s n�kkel, ID %s, opprettet %s%s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 msgid "Repeat passphrase\n"
 msgstr "Gjenta passfrase\n"
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 msgid "Enter passphrase\n"
 msgstr "Tast inn passfrase\n"
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5130,12 +5125,12 @@ msgstr ""
 "Du trenger en passfrase for � l�se opp den hemmelige n�kkelen for\n"
 "brukeren: �%s�\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit %s-n�kkel, ID %s, opprettet %s"
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5461,28 +5456,28 @@ msgstr "n�kkel %s: ingen brukerid\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr ""
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr ""
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "kan ikke �pne �%s�: %s\n"
@@ -5736,12 +5731,12 @@ msgstr "NOTIS: signaturn�kkelen %s utgikk %s\n"
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "n�kkel %s: ingen undern�kkel for undern�kkelopphevingssignatur\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "n�kkel %s: ingen undern�kkel for undern�kkelbindingssignatur\n"
@@ -6204,17 +6199,28 @@ msgstr "kan ikke �pne �%s�: %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du fant en feil ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "feil ved lesing av �%s�: %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr "vennligst se http://www.gnupg.org/faq.html for mere informasjon\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "signering mislyktes: %s\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
@@ -6475,16 +6481,16 @@ msgid ""
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6690,7 +6696,7 @@ msgstr ""
 msgid "[Error - invalid DN]"
 msgstr "Feil: ugyldig respons.\n"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7020,39 +7026,39 @@ msgstr ""
 "signere, sjekke, kryptere eller dekryptere\n"
 "standard operasjon avhenger av inputdata\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan ikke aksere �%s�: %s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 msgid "key generation is not available from the commandline\n"
 msgstr ""
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, fuzzy, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "Vennligst velg hvilken type n�kkel du vil generere:\n"
@@ -7076,7 +7082,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
@@ -7149,7 +7155,7 @@ msgstr "Feil: ugyldig formattert fingeravtrykk.\n"
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7160,13 +7166,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7239,127 +7245,127 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "for lang linje"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "ukjent valg �%s�\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "signering mislyktes: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr ""
 
@@ -7399,21 +7405,21 @@ msgid ""
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 #, fuzzy
 msgid "Component not found"
 msgstr "fant ikke offentlig n�kkel"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Admin-kommandoer er ikke tillatt\n"
@@ -7472,119 +7478,119 @@ msgid ""
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s er ikke tillatt sammen med %s!\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "%s er ikke tillatt sammen med %s!\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "feil med �%s�: %s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "fjernutf�ring av programmer er ikke st�ttet\n"
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "sleting av n�kkelblokk mislyktes: %s\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr ""
 
@@ -7593,6 +7599,10 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "ikke st�ttet"
 
+#~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
+#~ msgstr ""
+#~ "cipherutvidelse �%s� ble ikke lastet p� grunn av utrygge rettigheter\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA krever bruk av en 160-bit hashalgoritme\n"
 
@@ -7859,9 +7869,6 @@ msgstr "ikke st�ttet"
 #~ msgid "WARNING: using insecure memory!\n"
 #~ msgstr "ADVARSEL: bruker usikkert minne!\n"
 
-#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
-#~ msgstr "vennligst se http://www.gnupg.org/faq.html for mere informasjon\n"
-
 #~ msgid "operation is not possible without initialized secure memory\n"
 #~ msgstr "operasjonen er ikke mulig uten initialisert sikkert minne\n"
 
diff --git a/po/pl.po b/po/pl.po
index 5f02d5394..1701adc3d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+0200\n"
 "PO-Revision-Date: 2004-06-23 15:54+0200\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -24,59 +24,59 @@ msgstr ""
 "sig-check.c g10/sign.c g10/trustdb.c g10/verify.c g10/status.c g10/pubkey-"
 "enc.c\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 #, fuzzy
 msgid "PIN too long"
 msgstr "linia zbyt d�uga\n"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "has�o zbyt d�ugie\n"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 #, fuzzy
 msgid "Bad PIN"
 msgstr "b��d MPI"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "niepoprawne has�o"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 #, fuzzy
 msgid "Passphrase"
 msgstr "niepoprawne has�o"
@@ -86,7 +86,7 @@ msgstr "niepoprawne has�o"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
@@ -95,12 +95,12 @@ msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
@@ -199,13 +199,13 @@ msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Musisz poda� d�ugie, skomplikowane has�o aby ochroni� sw�j klucz tajny.\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "zmiana has�a klucza"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr ""
 
@@ -214,7 +214,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "zmiana has�a klucza"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -225,243 +225,243 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "z dodatkowymi informacjami"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�ww"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "szukanie kluczy na serwerze"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "uaktualnienie bazy zaufania"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
-#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "b��d tworzenia `%s': %s\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nie mo�na utworzy� katalogu ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "b��d przy wysy�aniu do ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: katalog utworzony\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "baza zaufania: funkcja read() (n=%d) zawiod�a: %s\n"
 
-#: agent/gpg-agent.c:1359
+#: agent/gpg-agent.c:1358
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: nie mo�na utworzy� katalogu: %s\n"
 
-#: agent/gpg-agent.c:1461
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1466
+#: agent/gpg-agent.c:1465
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483
+#: agent/gpg-agent.c:1482
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1488
+#: agent/gpg-agent.c:1487
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "zapis zmian na kluczu prywatnym nie powi�d� si�: %s\n"
 
-#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu kluczy pomini�tych\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
 
-#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "z�y format zmiennej �rodowiskowej GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "wersja %d protoko�u agenta nie jest obs�ugiwana\n"
@@ -488,80 +488,80 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 #, fuzzy
 msgid "Passphrase:"
 msgstr "niepoprawne has�o"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Anuluj"
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "tajne cz�ci klucza s� niedost�pne\n"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "b��d odczytu: %s\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -574,7 +574,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -584,7 +584,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr ""
 
@@ -596,19 +596,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 #, fuzzy
 msgid "Yes"
 msgstr "tak"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr ""
 
@@ -652,45 +652,45 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "b��d tworzenia `%s': %s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 #, fuzzy
 msgid "host not found"
 msgstr "%s: nie znaleziono u�ytkownika\n"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr "problem z porozumiewaniem si� z agentem\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "problem agenta: zwr�ci� 0x%lx\n"
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "anulowano przez u�ytkownika\n"
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problem agenta: zwr�ci� 0x%lx\n"
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nie mo�na wy��czy� zrzut�w pami�ci: %s\n"
@@ -867,11 +867,11 @@ msgstr "OSTRZE�ENIE: niepoprawne dane w adnotacji\n"
 msgid "not human readable"
 msgstr "nieczytelne dla cz�owieka"
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1191,7 +1191,7 @@ msgstr "Niepoprawna komenda  (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:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo�na otworzy� ,,%s''\n"
@@ -1752,57 +1752,57 @@ msgstr "Skr�t�w: "
 msgid "Compression: "
 msgstr "Kompresji: "
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1810,21 +1810,21 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1832,482 +1832,475 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nieznana opcja ,,%s''\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "okazanie, w kt�rym zbiorze znajduje si� dany klucz"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "UWAGA: stary domy�lny plik opcji ,,%s'' zosta� zignorowany\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/gpg.c:2266
-#, fuzzy, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr ""
-"modu� szyfru ,,%s'' nie zosta� za�adowany z powodu niebezpiecznych praw "
-"dost�pu\n"
-
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2582
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, 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:2804
+#: g10/gpg.c:2781
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w po��czeniu z %s!\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/gpg.c:2938
+#: g10/gpg.c:2915
 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:2944
+#: g10/gpg.c:2921
 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:2950
+#: g10/gpg.c:2927
 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:2963
+#: g10/gpg.c:2940
 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:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3041
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/gpg.c:3066
+#: g10/gpg.c:3043
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "warto�� max-cert-depth musi mie�ci� si� w zakresie od 1 do 255\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3045
 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:3070
+#: g10/gpg.c:3047
 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:3073
+#: g10/gpg.c:3050
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3054
 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:3084
+#: g10/gpg.c:3061
 msgid "invalid default preferences\n"
 msgstr "niew�a�ciwe domy�lne ustawienia\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 msgid "invalid personal cipher preferences\n"
 msgstr "niew�a�ciwe ustawienia szyfr�w\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 msgid "invalid personal digest preferences\n"
 msgstr "niew�a�ciwe ustawienia skr�t�w\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 msgid "invalid personal compress preferences\n"
 msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie dzia�a z %s!\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "szyfr ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/gpg.c:3186
+#: g10/gpg.c:3163
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "skr�t ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/gpg.c:3191
+#: g10/gpg.c:3168
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "kompresja ,,%s'' nie jest dost�pna w trybie %s\n"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3294
+#: g10/gpg.c:3271
 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:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3329
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3380
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3400
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3556
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
 
-#: g10/gpg.c:4184
+#: g10/gpg.c:4161
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:4217
+#: g10/gpg.c:4194
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
@@ -5220,96 +5213,96 @@ msgstr "podpis starego typu (PGP 2.x).\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "naniesienie poprawek bazy zaufania nie powiod�o si�: %s\n"
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "baza zaufania: funkcja read() (n=%d) zawiod�a: %s\n"
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "nie mo�na obs�u�y� tego algorytmu klucza publicznego: %d\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algorytm szyfruj�cy nie jest zaimplementowany"
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "modu� szyfru IDEA nie jest dost�pny\n"
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = potrzebuj� wi�cej informacji\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d jest przestarza�� opcj� ,,%s''\n"
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "w jej miejsce nale�y u�y� ,,%s%s''\"\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 msgid "Uncompressed"
 msgstr "Nieskompresowany"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Nieskompresowany"
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "ta wiadomo�� mo�e nie da� si� odczyta� za pomoc� %s\n"
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nieznany domy�lny adresat ,,%s''\n"
@@ -5368,12 +5361,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (podklucz %08lX)"
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5384,24 +5377,24 @@ msgstr ""
 "\"%.*s\".\n"
 "Klucz o d�ugo�ci %u bit�w, typ %s, numer %08lX, stworzony %s%s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 msgid "Repeat passphrase\n"
 msgstr "Powt�rzone has�o\n"
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 msgid "Enter passphrase\n"
 msgstr "Has�o\n"
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr "anulowano przez u�ytkownika\n"
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem agenta: zwr�ci� 0x%lx\n"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5411,12 +5404,12 @@ msgstr ""
 "Musisz poda� has�o aby odbezpieczy� klucz prywatny u�ytkownika:\n"
 "\""
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�ugo�� %u bit�w, typ %s, numer %08lX, stworzony %s"
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5757,28 +5750,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:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr "Podpis oddzielony od danych.\n"
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr "Nazwa pliku danych: "
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr "czytam strumie� standardowego wej�cia\n"
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr "brak podpisanych danych\n"
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nie mo�na otworzy� podpisanego pliku ,,%s''\n"
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "nie mo�na otworzy� podpisanego pliku ,,%s''\n"
@@ -6051,12 +6044,12 @@ msgstr ""
 "podpis z�o�ony kluczem %08lX uznany za niewa�ny z powodu nieznanego bitu "
 "krytycznego\n"
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "klucz %08lX: brak podklucza, kt�rego dotyczy uniewa�nienie\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "klucz %08lX: brak podklucza dowi�zywanego podpisem\n"
@@ -6547,17 +6540,28 @@ msgstr "nie mo�na otworzy� ,,%s'': %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "znalaz�e�(a�) b��d w programie ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "b��d odczytu ,,%s'': %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr "obja�nienie mo�na przeczyta� tutaj: http://www.gnupg.org/faq.html\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "nie mo�na otworzy� pliku: %s\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
@@ -6826,16 +6830,16 @@ msgid ""
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7052,7 +7056,7 @@ msgstr ""
 msgid "[Error - invalid DN]"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7374,40 +7378,40 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "spos�b u�ycia: gpgm [opcje]"
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nie mo�na zamkn�� ,,%s'': %s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 #, fuzzy
 msgid "key generation is not available from the commandline\n"
 msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, fuzzy, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "Prosz� wybra� rodzaj klucza:\n"
@@ -7431,7 +7435,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
@@ -7504,7 +7508,7 @@ msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7515,13 +7519,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7594,129 +7598,129 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "linia zbyt d�uga\n"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "nieznany domy�lny adresat ,,%s''\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "b��d przy wysy�aniu do ,,%s'': %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "b��d przy wysy�aniu do ,,%s'': %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "umo�liwienie pe�nego �ledzenia programu"
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|ALG|wymuszenie algorytmu szyfruj�cego ALG dla has�a"
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr ""
 
@@ -7756,21 +7760,21 @@ msgid ""
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 #, fuzzy
 msgid "Component not found"
 msgstr "brak klucza publicznego"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 #, fuzzy
 msgid "No argument allowed"
 msgstr "zapisuj� klucz tajny w '%s'\n"
@@ -7829,119 +7833,119 @@ msgid ""
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "naniesienie poprawek bazy zaufania nie powiod�o si�: %s\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "nie mo�na utworzy� katalogu ,,%s'': %s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "nie mo�na otworzy� %s: %s\n"
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "odwo�ania do zewn�trznych program�w s� wy��czone\n"
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, fuzzy, c-format
 msgid "could not fork: %s\n"
 msgstr "%s: nie znaleziono u�ytkownika %s\n"
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr ""
 
@@ -7950,6 +7954,12 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
 
+#, fuzzy
+#~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
+#~ msgstr ""
+#~ "modu� szyfru ,,%s'' nie zosta� za�adowany z powodu niebezpiecznych praw "
+#~ "dost�pu\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr ""
 #~ "Algorytm DSA wymaga u�ycia algorytmu skr�tu daj�cego 160-bitowy wynik.\n"
@@ -8239,9 +8249,6 @@ msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
 #~ msgid "WARNING: using insecure memory!\n"
 #~ msgstr "OSTRZE�ENIE: nie mo�na zabezpieczy� u�ywanej pami�ci!\n"
 
-#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
-#~ msgstr "obja�nienie mo�na przeczyta� tutaj: http://www.gnupg.org/faq.html\n"
-
 #~ msgid "operation is not possible without initialized secure memory\n"
 #~ msgstr "bez zabezpieczenia pami�ci nie mo�na wykona� tej operacji\n"
 
diff --git a/po/pt.po b/po/pt.po
index a274c552d..a6bf1263e 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+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"
@@ -17,59 +17,59 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 #, fuzzy
 msgid "PIN too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter inv�lido no nome\n"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorreto"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frase secreta incorrecta"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 #, fuzzy
 msgid "Passphrase"
 msgstr "frase secreta incorrecta"
@@ -79,7 +79,7 @@ msgstr "frase secreta incorrecta"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
@@ -88,12 +88,12 @@ msgstr "imposs�vel criar `%s': %s\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -192,13 +192,13 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -218,243 +218,243 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "detalhado"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizar a base de dados de confian�a"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, 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:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directoria criada\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, 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:1359
+#: agent/gpg-agent.c:1358
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: agent/gpg-agent.c:1461
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1466
+#: agent/gpg-agent.c:1465
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483
+#: agent/gpg-agent.c:1482
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1488
+#: agent/gpg-agent.c:1487
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignorado: %s\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 #, 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:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
 
-#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "a vers�o %d do protocolo gpg-agent n�o � suportada\n"
@@ -481,80 +481,80 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 #, fuzzy
 msgid "Passphrase:"
 msgstr "frase secreta incorrecta"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 #, fuzzy
 msgid "cancelled\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "partes da chave secreta n�o dispon�veis\n"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "armadura: %s\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -567,7 +567,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -577,7 +577,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr ""
 
@@ -589,19 +589,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 #, fuzzy
 msgid "Yes"
 msgstr "sim"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr ""
 
@@ -645,45 +645,45 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 #, fuzzy
 msgid "host not found"
 msgstr "[Utilizador n�o encontrado]"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel ligar a `%s': %s\n"
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr "problemas na comunica��o com o gpg-agent\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "imposs�vel desactivar core dumps: %s\n"
@@ -861,11 +861,11 @@ msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 msgid "not human readable"
 msgstr "n�o leg�vel por humanos"
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1183,7 +1183,7 @@ 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:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
@@ -1746,550 +1746,543 @@ msgstr "Dispers�o: "
 msgid "Compression: "
 msgstr "Compress�o: "
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "nenhum sinal = encontrada na defini��o de grupo \"%s\"\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostrar em que porta-chave a chave est�"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: o ficheiro antigo de op��es por omiss�o `%s' foi ignorado\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2266
-#, fuzzy, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr ""
-"a extens�o de cifra \"%s\" n�o foi carregada devido �s suas permiss�es "
-"inseguras\n"
-
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, 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:2515
+#: g10/gpg.c:2492
 #, 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:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 msgid "invalid import options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 msgid "invalid export options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2582
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 #, 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:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, 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:2804
+#: g10/gpg.c:2781
 #, 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:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, 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:2938
+#: g10/gpg.c:2915
 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:2944
+#: g10/gpg.c:2921
 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:2950
+#: g10/gpg.c:2927
 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:2963
+#: g10/gpg.c:2940
 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:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3041
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3066
+#: g10/gpg.c:3043
 #, 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:3068
+#: g10/gpg.c:3045
 #, 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:3070
+#: g10/gpg.c:3047
 #, 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:3073
+#: g10/gpg.c:3050
 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:3077
+#: g10/gpg.c:3054
 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:3084
+#: g10/gpg.c:3061
 msgid "invalid default preferences\n"
 msgstr "prefer�ncias por omiss�o inv�lidas\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 msgid "invalid personal cipher preferences\n"
 msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 msgid "invalid personal digest preferences\n"
 msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 msgid "invalid personal compress preferences\n"
 msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, 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:3186
+#: g10/gpg.c:3163
 #, 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:3191
+#: g10/gpg.c:3168
 #, 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:3283
+#: g10/gpg.c:3260
 #, 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:3294
+#: g10/gpg.c:3271
 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:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3329
 #, 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:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3380
 #, 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:3423
+#: g10/gpg.c:3400
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3556
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 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:4184
+#: g10/gpg.c:4161
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:4217
+#: g10/gpg.c:4194
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
@@ -5202,99 +5195,99 @@ msgstr "formato de assinatura antigo (PGP2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo de criptografia n�o implementado"
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "o 'plugin' com a cifra IDEA n�o est� presente\n"
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostrar mais informa��es\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: op��o depreciada \"%s\"\n"
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor utilize \"%s%s\" em vez dela\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 #, fuzzy
 msgid "Uncompressed"
 msgstr "n�o processado"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "n�o processado"
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "esta mensagem poder� n�o ser utiliz�vel pelo %s\n"
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
@@ -5351,12 +5344,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5369,24 +5362,24 @@ msgstr ""
 "\"%.*s\"\n"
 "chave %u bits %s, ID %08lx, criada %s%s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 msgid "Repeat passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 msgid "Enter passphrase\n"
 msgstr "Insira a frase secreta\n"
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5396,12 +5389,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "utilizador: \""
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5740,28 +5733,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:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr "Assinatura separada.\n"
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do ficheiro de dados: "
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr "lendo do \"stdin\" ...\n"
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr "n�o h� dados assinados\n"
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
@@ -6026,12 +6019,12 @@ msgstr ""
 "assumindo assinatura incorrecta na chave %08lX devido a um bit cr�tico "
 "desconhecido\n"
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "chave %08lX: sem subchave para o pacote revoca��o de subchave\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
@@ -6523,17 +6516,28 @@ msgstr "imposs�vel abrir `%s': %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr "por favor veja http://www.gnupg.org/faq.html para mais informa��es\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
@@ -6802,16 +6806,16 @@ msgid ""
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7019,7 +7023,7 @@ msgstr ""
 msgid "[Error - invalid DN]"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7347,40 +7351,40 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [op��es] "
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "imposs�vel ligar a `%s': %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "imposs�vel fechar `%s': %s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 #, fuzzy
 msgid "key generation is not available from the commandline\n"
 msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, fuzzy, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
@@ -7404,7 +7408,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -7477,7 +7481,7 @@ msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7488,13 +7492,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7567,130 +7571,130 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "frase secreta demasiado longa\n"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr ""
 
@@ -7730,21 +7734,21 @@ msgid ""
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uso: gpg [op��es] "
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 #, fuzzy
 msgid "Component not found"
 msgstr "chave p�blica n�o encontrada"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 #, fuzzy
 msgid "No argument allowed"
 msgstr "a escrever chave privada para `%s'\n"
@@ -7803,118 +7807,118 @@ msgid ""
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 msgid "no --program option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr ""
 
@@ -7923,6 +7927,12 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 
+#, fuzzy
+#~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
+#~ msgstr ""
+#~ "a extens�o de cifra \"%s\" n�o foi carregada devido �s suas permiss�es "
+#~ "inseguras\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr ""
 #~ "DSA necessita de utiliza��o de uma algoritmo de dispers�o de 160 bit\n"
@@ -8179,10 +8189,6 @@ msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 #~ msgid "WARNING: using insecure memory!\n"
 #~ msgstr "AVISO: a utilizar mem�ria insegura!\n"
 
-#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
-#~ msgstr ""
-#~ "por favor veja http://www.gnupg.org/faq.html para mais informa��es\n"
-
 #~ msgid "operation is not possible without initialized secure memory\n"
 #~ msgstr "a opera��o n�o � poss�vel sem mem�ria segura inicializada\n"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8a691a6e2..223f598d4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+0200\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -21,59 +21,59 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Por favor digite a frase secreta"
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 #, fuzzy
 msgid "PIN too long"
 msgstr "linha muito longa\n"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "linha muito longa\n"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caractere inv�lido no nome\n"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorreto"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frase secreta incorreta"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 #, fuzzy
 msgid "Passphrase"
 msgstr "frase secreta incorreta"
@@ -83,7 +83,7 @@ msgstr "frase secreta incorreta"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, fuzzy, c-format
@@ -92,12 +92,12 @@ msgstr "imposs�vel criar %s: %s\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -197,13 +197,13 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr ""
 
@@ -212,7 +212,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -223,241 +223,241 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "detalhado"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "exportar chaves para um servidor"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, 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:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, fuzzy, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
 
-#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: diret�rio criado\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, 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:1359
+#: agent/gpg-agent.c:1358
 #, 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:1461
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1466
+#: agent/gpg-agent.c:1465
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483
+#: agent/gpg-agent.c:1482
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1488
+#: agent/gpg-agent.c:1487
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves ignoradas\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
@@ -484,79 +484,79 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor digite a frase secreta"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Por favor digite a frase secreta"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Por favor digite a frase secreta"
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 #, fuzzy
 msgid "Passphrase:"
 msgstr "frase secreta incorreta"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 msgid "cancelled\n"
 msgstr ""
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "erro de leitura: %s\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -569,7 +569,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -579,7 +579,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr ""
 
@@ -591,19 +591,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 #, fuzzy
 msgid "Yes"
 msgstr "sim"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr ""
 
@@ -647,42 +647,42 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 #, fuzzy
 msgid "host not found"
 msgstr "%s: usu�rio n�o encontrado\n"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 msgid "canceled by user\n"
 msgstr ""
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 msgid "problem with the agent\n"
 msgstr ""
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "imposs�vel desativar core dumps: %s\n"
@@ -863,11 +863,11 @@ msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 msgid "not human readable"
 msgstr ""
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1187,7 +1187,7 @@ msgstr "Comando inv�lido (tente \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
@@ -1751,557 +1751,552 @@ msgstr ""
 msgid "Compression: "
 msgstr "Coment�rio: "
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2266
-#, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr ""
-
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, 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:2515
+#: g10/gpg.c:2492
 #, 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:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2582
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 #, 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:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2804
+#: g10/gpg.c:2781
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/gpg.c:2938
+#: g10/gpg.c:2915
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2921
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:2927
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2963
+#: g10/gpg.c:2940
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3041
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3066
+#: g10/gpg.c:3043
 #, 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:3068
+#: g10/gpg.c:3045
 #, 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:3070
+#: g10/gpg.c:3047
 #, 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:3073
+#: g10/gpg.c:3050
 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:3077
+#: g10/gpg.c:3054
 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:3084
+#: g10/gpg.c:3061
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3186
+#: g10/gpg.c:3163
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3191
+#: g10/gpg.c:3168
 #, 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:3283
+#: g10/gpg.c:3260
 #, 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:3294
+#: g10/gpg.c:3271
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3329
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3380
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3400
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3556
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, 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:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4184
+#: g10/gpg.c:4161
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4217
+#: g10/gpg.c:4194
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
@@ -5150,97 +5145,97 @@ msgstr "formato de assinatura antigo (PGP2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "atualiza��o do banco de dados de confiabilidade falhou: %s\n"
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n"
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo de criptografia n�o implementado"
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 #, fuzzy
 msgid "Uncompressed"
 msgstr "n�o processado(s)"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "n�o processado(s)"
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
@@ -5297,12 +5292,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5314,26 +5309,26 @@ msgstr ""
 "usu�rio: \"%.*s\"\n"
 "%u-bit %s chave, ID %08lX, criada %s%s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5343,12 +5338,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "usu�rio: \""
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5690,29 +5685,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:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr "Assinatura separada.\n"
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do arquivo de dados: "
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr "lendo de \"stdin\" ...\n"
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 #, fuzzy
 msgid "no signed data\n"
 msgstr "no dados assinados\n"
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
@@ -5975,12 +5970,12 @@ msgstr "NOTA: chave de assinatura %08lX expirou %s\n"
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "assumindo assinatura incorreta devido a um bit cr�tico desconhecido\n"
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
@@ -6464,17 +6459,28 @@ msgstr "imposs�vel abrir `%s': %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr "rev- revoga��es de chaves incorreta\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "imposs�vel abrir arquivo: %s\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
@@ -6743,16 +6749,16 @@ msgid ""
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6968,7 +6974,7 @@ msgstr ""
 msgid "[Error - invalid DN]"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7294,39 +7300,39 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Uso: gpgm [op��es] "
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 msgid "key generation is not available from the commandline\n"
 msgstr ""
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, fuzzy, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
@@ -7350,7 +7356,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -7423,7 +7429,7 @@ msgstr "erro: impress�o digital inv�lida\n"
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7434,13 +7440,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7514,131 +7520,131 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "linha muito longa\n"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "habilitar depura��o completa"
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr ""
 
@@ -7678,21 +7684,21 @@ msgid ""
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uso: gpg [op��es] "
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 #, fuzzy
 msgid "Component not found"
 msgstr "chave p�blica n�o encontrada"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 #, fuzzy
 msgid "No argument allowed"
 msgstr "escrevendo certificado privado para `%s'\n"
@@ -7751,118 +7757,118 @@ msgid ""
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "atualiza��o do banco de dados de confiabilidade falhou: %s\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 msgid "no --program option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, fuzzy, c-format
 msgid "could not fork: %s\n"
 msgstr "%s: usu�rio n�o encontrado: %s\n"
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr ""
 
diff --git a/po/ro.po b/po/ro.po
index 8bc039eba..2a173fa0b 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+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"
@@ -18,18 +18,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "am e�uat s� stochez amprenta: %s\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -37,41 +37,41 @@ msgid ""
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 #, fuzzy
 msgid "PIN too long"
 msgstr "linie prea lung�"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "fraz�-parol� prea lung�\n"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter invalid �n nume\n"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorect"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "fraz�-parol� incorect�"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 #, fuzzy
 msgid "Passphrase"
 msgstr "fraz�-parol� incorect�"
@@ -81,7 +81,7 @@ msgstr "fraz�-parol� incorect�"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritm rezumat %d nu este suportat\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
@@ -90,12 +90,12 @@ msgstr "nu pot crea `%s': %s\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nu pot deschide `%s': %s\n"
@@ -195,13 +195,13 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a v� proteja cheia secret�.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr ""
 
@@ -210,7 +210,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -221,242 +221,242 @@ msgstr ""
 "Op�iuni:\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "locvace"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "fii oarecum mai t�cut"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "caut� pentru chei pe un server de chei"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizeaz� baza de date de �ncredere"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Raporta�i bug-uri la <[email protected]>.\n"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, 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:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "eroare la creearea `%s': %s\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "director `%s' creat\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) a e�uat �n %s: %s\n"
 
-#: agent/gpg-agent.c:1359
+#: agent/gpg-agent.c:1358
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: nu pot crea director: %s\n"
 
-#: agent/gpg-agent.c:1461
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1466
+#: agent/gpg-agent.c:1465
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483
+#: agent/gpg-agent.c:1482
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1488
+#: agent/gpg-agent.c:1487
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "actualizarea secretului a e�uat: %s\n"
 
-#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: s�rit�: %s\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
 
-#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent versiune protocol %d nu este suportat\n"
@@ -483,25 +483,25 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
@@ -509,57 +509,57 @@ msgid ""
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 #, fuzzy
 msgid "Passphrase:"
 msgstr "fraz�-parol� incorect�"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 #, fuzzy
 msgid "cancelled\n"
 msgstr "anulat�"
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "eroare �n `%s': %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "p�r�i ale cheii secrete nu sunt disponibile\n"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "eroare citire �n `%s': %s\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -572,7 +572,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -582,7 +582,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr ""
 
@@ -594,19 +594,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 #, fuzzy
 msgid "Yes"
 msgstr "da"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr ""
 
@@ -650,45 +650,45 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "eroare la creearea `%s': %s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 #, fuzzy
 msgid "host not found"
 msgstr "[ID utilizator nu a fost g�sit]"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nu m� pot conecta la `%s': %s\n"
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr "probleme de comunicare cu gpg-agent\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "anulat� de utilizator\n"
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nu pot deactiva generarea fi�ierelor core: %s\n"
@@ -862,11 +862,11 @@ msgstr "AVERTISMENT: am g�sit date de notare invalide\n"
 msgid "not human readable"
 msgstr "ilizibil"
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1158,7 +1158,7 @@ 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:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nu pot deschide `%s'\n"
@@ -1714,61 +1714,61 @@ msgstr "Hash: "
 msgid "Compression: "
 msgstr "Compresie: "
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "comenzi �n conflict\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "nu am g�sit nici un semn = �n defini�ia grupului `%s'\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigur� (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigur� (unsafe) pentru fi�ier configurare `%s'\n"
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru fi�ier configurare `%s'\n"
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1776,21 +1776,21 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1798,478 +1798,471 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "arat� c�ruia dintre inelele de chei �i apar�ine o cheie enumerat�"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
 
-#: g10/gpg.c:2266
-#, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr ""
-"extensie cifru `%s' nu a fost �nc�rcat din cauza permisiunilor nesigure "
-"(unsafe)\n"
-
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2492
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nu este un set de carectere valid\n"
 
 #
-#: g10/gpg.c:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2527
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2530
 msgid "invalid keyserver options\n"
 msgstr "op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op�iuni import invalide\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 msgid "invalid import options\n"
 msgstr "op�iuni import invalide\n"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 msgid "invalid export options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 msgid "invalid list options\n"
 msgstr "op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2582
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 msgid "invalid verify options\n"
 msgstr "op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execu�ie ca %s\n"
 
-#: g10/gpg.c:2804
+#: g10/gpg.c:2781
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, 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:2938
+#: g10/gpg.c:2915
 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:2944
+#: g10/gpg.c:2921
 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:2950
+#: g10/gpg.c:2927
 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:2963
+#: g10/gpg.c:2940
 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:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3041
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
 
-#: g10/gpg.c:3066
+#: g10/gpg.c:3043
 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:3068
+#: g10/gpg.c:3045
 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:3070
+#: g10/gpg.c:3047
 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:3073
+#: g10/gpg.c:3050
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3054
 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:3084
+#: g10/gpg.c:3061
 msgid "invalid default preferences\n"
 msgstr "preferin�e implicite invalide\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 msgid "invalid personal cipher preferences\n"
 msgstr "preferin�e cifrare personale invalide\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 msgid "invalid personal digest preferences\n"
 msgstr "preferin�e rezumat personale invalide\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 msgid "invalid personal compress preferences\n"
 msgstr "preferin�e compresie personale invalide\n"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge �nc� cu %s!\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, 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:3186
+#: g10/gpg.c:3163
 #, 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:3191
+#: g10/gpg.c:3168
 #, 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:3283
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/gpg.c:3294
+#: g10/gpg.c:3271
 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:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [nume_fi�ier]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "cifrarea simetric� a lui `%s' a e�uat: %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 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:3352
+#: g10/gpg.c:3329
 #, 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:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [nume_fi�ier]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 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:3403
+#: g10/gpg.c:3380
 #, 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:3423
+#: g10/gpg.c:3400
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nume_fi�ier]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizator"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizator"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizator [comenzi]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recep�ie server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3556
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie e�uat: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "c�utare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[nume_fi�ier]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/gpg.c:4184
+#: g10/gpg.c:4161
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
 
-#: g10/gpg.c:4217
+#: g10/gpg.c:4194
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
@@ -5121,96 +5114,96 @@ msgstr "semn�tur� de stil vechi (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pachet root invalid detectat �n proc_tree()\n"
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat pentru `%s' a e�uat �n %s: %s\n"
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) a e�uat �n %s: %s\n"
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "AVERTISMENT: folosesc algoritmul cu cheie public� experimental %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "AVERTISMENT: folosesc algoritmul de cifrare experimental %s\n"
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "AVERTISMENT: folosesc algoritmul rezumat experimental %s\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVERTISMENT: algoritmul rezumat %s este prea vechi (deprecated)\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin-ul pentru cifrare IDEA nu este prezent\n"
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = arat�-mi mai multe informa�ii\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: op�iune �nvechit� \"%s\"\n"
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "v� rug�m folosi�i \"%s%s\" �n loc\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVERTISMENT: \"%s\" este o comand� �nvechit� - nu o folosi�i\n"
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 msgid "Uncompressed"
 msgstr "Necompresat"
 
 #
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 msgid "uncompressed|none"
 msgstr "necompresat|niciunul"
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "acest mesaj s-ar putea s� nu poat� fi folosit de %s\n"
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "op�iune ambigu� `%s'\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "op�iune necunoscut� `%s'\n"
@@ -5269,12 +5262,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpachetul de tip %d are bitul critic setat\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cheie principal� %s)"
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5286,24 +5279,24 @@ msgstr ""
 "\"%.*s\"\n"
 "cheia %u-bit %s, ID %s, creat� %s%s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 msgid "Repeat passphrase\n"
 msgstr "Repeta�i fraza-parol�\n"
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 msgid "Enter passphrase\n"
 msgstr "Introduce�i fraza-parol�\n"
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr "anulat� de utilizator\n"
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5312,12 +5305,12 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a descuia cheia secret� pentru\n"
 "utilizator: \"%s\"\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "cheia %u-bit %s, ID %s, creat� %s"
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (subcheie pe cheia principal� ID %s)"
@@ -5655,28 +5648,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:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr "Semn�tur� deta�at�.\n"
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr "V� rug�m introduce�i numele fi�ierului de date: "
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr "citesc stdin ...\n"
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr "nici o dat� semnat�\n"
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nu pot deschide date semnate `%s'\n"
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "nu pot deschide date semnate `%s'\n"
@@ -5942,12 +5935,12 @@ msgstr ""
 "presupun semn�tur� incorect� din cheia %s datorit� unui bit critic "
 "necunoscut\n"
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "cheia %s: nici o subcheie pentru semn�tura de revocare a subcheii\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "cheia %s: nici o subcheie pentru semn�tura legat� de subcheie\n"
@@ -6427,17 +6420,28 @@ msgstr "nu pot deschide `%s': %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "a�i g�sit un bug ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "eroare la citire `%s': %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr "vede�i http://www.gnupg.org/faq.html pentru informa�ii suplimentare\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "nu pot deschide fi�ierul: %s\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
@@ -6702,16 +6706,16 @@ msgid ""
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6919,7 +6923,7 @@ msgstr ""
 msgid "[Error - invalid DN]"
 msgstr "Eroare: r�spuns invalid.\n"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7243,40 +7247,40 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "nu m� pot conecta la `%s': %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nu pot accesa `%s': %s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 #, fuzzy
 msgid "key generation is not available from the commandline\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, fuzzy, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "V� rug�m selecta�i tipul de cheie de generat:\n"
@@ -7300,7 +7304,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "eroare la ob�inerea num�rului serial: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "eroare la citire `%s': %s\n"
@@ -7373,7 +7377,7 @@ msgstr "Eroare: amprent� formatat� invalid.\n"
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7384,13 +7388,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7463,128 +7467,128 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "linie prea lung�"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "op�iune necunoscut� `%s'\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "semnarea a e�uat: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "citirea cheii publice a e�uat: %s\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NUME|folose�te algoritm cifrare NUME pentru fraza-parol�"
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr ""
 
@@ -7624,21 +7628,21 @@ msgid ""
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 #, fuzzy
 msgid "Component not found"
 msgstr "cheia public� nu a fost g�sit�"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Nu sunt permise comenzi administrare\n"
@@ -7697,119 +7701,119 @@ msgid ""
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "fstat pentru `%s' a e�uat �n %s: %s\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "nu pot deschide %s: %s\n"
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "eroare �n `%s': %s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "nu este suportat� execu�ia nici unui program la distan��\n"
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "stergere keyblock a e�uat: %s\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "nu pot deschide fi�ierul: %s\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "nu pot crea fi�ier de rezerv� `%s': %s\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr ""
 
@@ -7818,6 +7822,11 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "algoritm rezumat %d nu este suportat\n"
 
+#~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
+#~ msgstr ""
+#~ "extensie cifru `%s' nu a fost �nc�rcat din cauza permisiunilor nesigure "
+#~ "(unsafe)\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA necesit� folosirea unui algoritm cu hash de 160 bi�i\n"
 
@@ -8121,10 +8130,6 @@ msgstr "algoritm rezumat %d nu este suportat\n"
 #~ msgid "WARNING: using insecure memory!\n"
 #~ msgstr "AVERTISMENT: este folosit� memorie neprotejat� (insecure)!\n"
 
-#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
-#~ msgstr ""
-#~ "vede�i http://www.gnupg.org/faq.html pentru informa�ii suplimentare\n"
-
 #~ msgid "operation is not possible without initialized secure memory\n"
 #~ msgstr ""
 #~ "opera�ia nu este posibil� f�r� memorie protejat� (secure) ini�ializat�\n"
diff --git a/po/ru.po b/po/ru.po
index 3602b5ea3..a830d0971 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 2.0.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+0200\n"
 "PO-Revision-Date: 2006-11-07 19:31+0300\n"
 "Last-Translator: Maxim Britov <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -16,53 +16,53 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr ""
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr "Введите PIN-код для получения доступа к закрытому ключу"
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Введите фразу-пароль для доступа к закрытому ключу"
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 msgid "PIN too long"
 msgstr "PIN слишком длинен"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 msgid "Passphrase too long"
 msgstr "фраза-пароль слишком длинная"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 msgid "Invalid characters in PIN"
 msgstr "Недопустимый символ в PIN-коде"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr "PIN-код слишком короткий"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 msgid "Bad PIN"
 msgstr "плохой PIN"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 msgid "Bad Passphrase"
 msgstr "Неверная фраза-пароль"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 msgid "Passphrase"
 msgstr "Фраза-пароль"
 
@@ -71,7 +71,7 @@ msgstr "Фраза-пароль"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "не поддерживаются ssh ключи превышающие %d бит\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
@@ -80,12 +80,12 @@ msgstr "не могу создать `%s': %s\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "не могу открыть `%s': %s\n"
@@ -182,12 +182,12 @@ msgstr "Введите фразу-пароль\n"
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr "Введите фразу-пароль%0Aдля защиты нового ключа"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 msgid "Please re-enter this passphrase"
 msgstr "Повторно введите фразу-пароль:"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr "не совпало, попробуйте еще раз"
 
@@ -195,7 +195,7 @@ msgstr "не совпало, попробуйте еще раз"
 msgid "Please enter the new passphrase"
 msgstr "Введите новую фразу-пароль"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 msgid ""
 "@Options:\n"
@@ -204,109 +204,109 @@ msgstr ""
 "@Параметры:\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "запуск в режиме сервера (foreground)"
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "запуск в режиме демона (background)"
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "подробно"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "уменьшить количество выводимой информации"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "вывод результатов в sh-стиле"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "вывод результатов в csh-стиле"
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|взять параметры из FILE"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr "не отсоединяться от консоли"
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr "не перехватывать события мыши и клавиатуры"
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 msgid "use a log file for the server"
 msgstr "использовать файл журнала для сервера"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 msgid "use a standard location for the socket"
 msgstr "стандартное расположение сокета"
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|использовать PGM как PIN-Entry"
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM| использовать PGM как SCdaemon"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "do not use the SCdaemon"
 msgstr "не использовать SCdaemon"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr "игнорировать запросы смены TTY"
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr "игнорировать запросы смены X дисплея"
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|кеш PIN просрочен после N секунд"
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr "не использовать кеш PIN при подписывании"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "позволить клиентам помечать ключи как \"доверяемые\""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "allow presetting passphrase"
 msgstr "разрешить предустановленную фразу-пароль"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr "разрешить эмуляцию ssh-агента"
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FILE|сохранить состояние в файл"
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 msgid "Please report bugs to <"
 msgstr "О найденных ошибках сообщайте <"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Использование: gpg-agent [параметры] (-h для подсказки)"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -314,126 +314,126 @@ msgstr ""
 "Синтаксис: gpg-agent [параметры] [команда [аргументы]]\n"
 "Управление закрытыми ключами для GnuPG\n"
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "запрошен недупустимый уровень отладки `%s'\n"
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, fuzzy, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "libksba слишком устаревшая (требуется %s, имеется %s)\n"
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
 
-#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл конфигурации `%s': %s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "параметры конфигурации из файла `%s'\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "ошибка создания `%s': %s\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "не могу создать каталог `%s': %s\n"
 
-#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr "имя сокета слишком длинное\n"
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "не могу создать сокет: %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "ошибка связывния сокета с `%s': %s\n"
 
-#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "слушаем сокет `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "создан каталог `%s'\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1359
+#: agent/gpg-agent.c:1358
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "невозможно использовать `%s' как домашний каталог\n"
 
-#: agent/gpg-agent.c:1461
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1466
+#: agent/gpg-agent.c:1465
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483
+#: agent/gpg-agent.c:1482
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1488
+#: agent/gpg-agent.c:1487
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s: остановлен\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 msgid "no gpg-agent running in this session\n"
 msgstr "нет gpg-agent доступого для данной сессии\n"
 
-#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "протокол gpg-agent версии %d не поддерживается\n"
@@ -464,21 +464,21 @@ msgstr ""
 "Синтаксис: gpg-protect-tool [параметры] [аргументы]\n"
 "Инструмент для работы с закрытыми ключами\n"
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Введите фразу-пароль для доступа к PKCS#12 объекту."
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Введите фразу-пароль для защиты нового PKCS#12 объекта."
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr "Введите фразу-пароль для защиты импортированных в GnuPG объектов."
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -486,55 +486,55 @@ msgstr ""
 "Введите фразу-пароль или PIN\n"
 "необходимые для выполения данной операции."
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 msgid "Passphrase:"
 msgstr "Фраза-пароль:"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "ошибка запроса ввода фразы-пароля: %s\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 msgid "cancelled\n"
 msgstr "отменено\n"
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, c-format
 msgid "error opening `%s': %s\n"
 msgstr "ошибка открытия `%s': %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "файл `%s', строка %d: %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "системный список доверий `%s' не доступен\n"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "недопустимый отпечаток в `%s', строка %d\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "ошибка чтения `%s', строка %d: %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr "ошибка чтения списка доверяемых корневых сертификатов\n"
 
@@ -547,7 +547,7 @@ msgstr "ошибка чтения списка доверяемых корнев
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -559,7 +559,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr "Подтверждаю"
 
@@ -571,7 +571,7 @@ msgstr "Подтверждаю"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -580,11 +580,11 @@ msgstr ""
 "Действительно абсолютно доверять%%0A  \"%s\"%%0Aкорректно подписанным "
 "сертификатам пользователя?"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "Yes"
 msgstr "Да"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr "Нет"
 
@@ -628,41 +628,41 @@ msgstr "ошибка запуска `%s': позможно не установл
 msgid "error running `%s': terminated\n"
 msgstr "ошибка чтения `%s': прервано\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, c-format
 msgid "error creating socket: %s\n"
 msgstr ""
 
-#: common/http.c:1665
+#: common/http.c:1671
 msgid "host not found"
 msgstr "хост не найден"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent недоступен в данной сессии\n"
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "не могу подключиться к `%s': %s\n"
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr "проблема связи с gpg-agent\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 msgid "problem setting the gpg-agent options\n"
 msgstr "проблема задания параметров gpg-agent\n"
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 msgid "canceled by user\n"
 msgstr "прервано пользователем\n"
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 msgid "problem with the agent\n"
 msgstr "проблема с агентом\n"
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "не могу отключить создание файла дампа образа памяти: %s\n"
@@ -835,11 +835,11 @@ msgstr "ВНИМАНИЕ: обнаружено недопустимое прим
 msgid "not human readable"
 msgstr "не читаемое человеком"
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr "нет работающих gpg-agent - запускаем\n"
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "невозможно подключиться к агенту - пробуем откатиться назад\n"
 
@@ -1131,7 +1131,7 @@ msgstr "Недопустимая команда  (список команд: \"h
 msgid "--output doesn't work for this command\n"
 msgstr "--output не работает для данной команды\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "не могу открыть `%s'\n"
@@ -1678,76 +1678,76 @@ msgstr "Хэш-функции: "
 msgid "Compression: "
 msgstr "Алгоритмы сжатия: "
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "использование: gpg [параметры] "
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "несовместимые команды\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "отсутствует знак = в определении группы `%s'\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец домашнего каталога `%s'\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла конфигурации `%s'\n"
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла модуля расширения `%s'\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа у домашнего каталога `%s'\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа у файла конфигурации `%s'\n"
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа у файла модуля расширения `%s'\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего домашний каталог `%s'\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего файл конфигурации `%s'\n"
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего модуль расширения `%s'\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа у каталога содержащего домашний каталог "
 "`%s'\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1755,467 +1755,461 @@ msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа у каталога содержащего файл "
 "конфигурации `%s'\n"
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа у каталогу содержащего файл модуля "
 "расширения `%s'\n"
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "неизвестный параметр в файле конфигурации `%s'\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr "отображать Фото ID при распечатке ключей"
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr "показывать ссылку на политики при распечатке подписей"
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 msgid "show all notations during signature listings"
 msgstr "показывать все примечания в списке подписей"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 "показывать добавленные пользователем примечания при распечатке подписей"
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "показываеть предпочитаемый сервер ключей с списке подписей"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr "показывать действительность Used ID при распечатке ключей"
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr "показывать отозванные и просроченные User ID при распечатке ключей"
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr "показывать отозванные и просроченные ключи при распечатке списка"
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 msgid "show the keyring name in key listings"
 msgstr "печатать имя таблиц ключей в списке ключей"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 msgid "show expiration dates during signature listings"
 msgstr "печатать даты истечения в списке подписей"
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libcrypt слишком старой версии (требуется %s, обнаружено %s)\n"
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "ЗАМЕЧАНИЕ: старый файл конфигурации по умолчанию `%s' проигнорирован\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ЗАМЕЧАНИЕ: %s не предназначен для обычного применения!\n"
 
-#: g10/gpg.c:2266
-#, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr ""
-"расширение шифра `%s' не загружено вследствие небезопасных прав доступа\n"
-
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2492
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' недопустимая таблица символов\n"
 
-#: g10/gpg.c:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 msgid "could not parse keyserver URL\n"
 msgstr "не могу проанализировать URL сервера ключей\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2527
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2530
 msgid "invalid keyserver options\n"
 msgstr "недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопустимый список параметров\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 msgid "invalid list options\n"
 msgstr "недопустимый список параметров\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr "показывать Фото ID при проверке подписи"
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr "показывать ссылку на политики при проверке подписи"
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 msgid "show all notations during signature verification"
 msgstr "показывать все примечания в процессе проверки подписей"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr "показывать добавленные пользователем примечания при проверке подписей"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "печатать предпочитаемые серверы ключей при проверке подписей"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2582
 msgid "show user ID validity during signature verification"
 msgstr "печатать действительность UserID при проверке подписей"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "показывать отозванные и просроченные User ID при проверке подписей"
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "показывать отозванные и просроченные User ID при проверке подписей"
 
-#: g10/gpg.c:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопустимые параметры проверки \n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 msgid "invalid verify options\n"
 msgstr "недопустимые параметры проверки\n"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
-#: g10/gpg.c:2804
+#: g10/gpg.c:2781
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr "недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти программы!\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ВНИМАНИЕ: %s заместит %s\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не допускается использовать с %s!\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s не имеет смысла совместно с %s!\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не будет работать с небезопасной памятью из-за %s\n"
 
-#: g10/gpg.c:2938
+#: g10/gpg.c:2915
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2921
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Нельзя одновременно подписать и зашифровать в режиме --pgp2\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:2927
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Следует использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
 
-#: g10/gpg.c:2963
+#: g10/gpg.c:2940
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифрования сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран неверный алгоритм сжатия\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция для сертификации\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3041
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/gpg.c:3066
+#: g10/gpg.c:3043
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3045
 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:3070
+#: g10/gpg.c:3047
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3050
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ЗАМЕЧАНИЕ: простой режим S2K (0) строго не рекомендуется\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3054
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3061
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые персональные предпочтения шифра\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые персональные предпочтения хэш-функции\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s пока не работает совместно с %s\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать шифрование `%s' в режиме %s\n"
 
-#: g10/gpg.c:3186
+#: g10/gpg.c:3163
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать хэш-функцию `%s' в режиме %s\n"
 
-#: g10/gpg.c:3191
+#: g10/gpg.c:3168
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать сжатие `%s' в режиме %s\n"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/gpg.c:3294
+#: g10/gpg.c:3271
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [файл]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [файл]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "симметричное шифрование `%s' не удалось: %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [файл]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [файл]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "нельзя использовать --symmetric --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3329
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [файл]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [файл]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [файл]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3380
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --sign --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3400
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [файл]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [файл]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [файл]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [команды]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "сбой при отправке на сервер ключей: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "сбой при получении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3556
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "сбой при экспорте ключа: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "сбой при поиске на сервере ключей: %s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "сбой при обновлении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из ASCII формата: %s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[файл]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "Набирайте Ваше сообщение ...\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL политики сертификации неверен\n"
 
-#: g10/gpg.c:4184
+#: g10/gpg.c:4161
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL политики подписи неверен\n"
 
-#: g10/gpg.c:4217
+#: g10/gpg.c:4194
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
@@ -5021,100 +5015,100 @@ msgstr "старый (PGP 2.x) стиль подписи\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr ""
 "ВНИМАНИЕ: используется экспериментальный алгоритм %s шифрования с открытым "
 "ключом\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr ""
 "ВНИМАНИЕ: используется экспериментальный алгоритм симметричного шифрования %"
 "s\n"
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "ВНИМАНИЕ: используется экспериментальная хеш-функция %s\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ВНИМАНИЕ: хеш-функция %s считается устаревшей\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "модуль поддержки шифра IDEA не обнаружен\n"
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "для дополнительной информации см. %s\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: не рекомендуемая опция \"%s\"\n"
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ВНИМАНИЕ: \"%s\" не рекомендуемая опция\n"
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "используйте \"%s%s\" взамен\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "ВНИМАНИЕ: команда \"%s\" является устаревшей - не следует применять ее\n"
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "ВНИМАНИЕ: \"%s\" не рекомендуемая опция\n"
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 msgid "Uncompressed"
 msgstr "Без сжатия"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "данное сообщение может быть не пригодно для %s\n"
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "двусмысленный параметр `%s'\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "неизвестный параметр `%s'\n"
@@ -5172,12 +5166,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "подпакет типа %d имеет выставленный критический бит\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (главный ключ ID %s)"
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5188,24 +5182,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-бит %s ключ, ID %s, создан %s%s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 msgid "Repeat passphrase\n"
 msgstr "Повторите ввод фразы-пароля\n"
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 msgid "Enter passphrase\n"
 msgstr "Введите фразу-пароль\n"
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr "прервано пользователем\n"
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "проблема с агентом: %s\n"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5213,12 +5207,12 @@ msgid ""
 msgstr ""
 "Необходима фраза-пароль для доступа к секретному ключу пользователя: \"%s\"\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-бит %s ключ, ID %s, создан %s"
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (подключ на главном ключе %s)"
@@ -5549,28 +5543,28 @@ msgstr "ключ %s не имеет User ID\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "данные не сохранены; используйте \"--output\" для сохранения\n"
 
-#: g10/plaintext.c:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr "Отделенная подпись.\n"
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr "Введите имя файла с данными: "
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr "читаю stdin ...\n"
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr "не подписанные данные\n"
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "не могу открыть подписанные данные `%s'\n"
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "не могу открыть подписанные данные `%s'\n"
@@ -5833,12 +5827,12 @@ msgstr "ЗАМЕЧАНИЕ: подписавший ключ %s - просроч�
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "принята плохая подпись ключа %s с неизвестным критическим битом\n"
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "ключ %s: нет подключа для подключа отзывающей подписи\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "ключ %s: нет подключа для подписи связи подключей\n"
@@ -6318,17 +6312,28 @@ msgstr "не могу открыть `%s': %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Вы нашли ошибку ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "ошибка чтения `%s': %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr "для дополнительной информации см. %s\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr "преобразование из `%s' в `%s' недоступно\n"
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, c-format
 msgid "iconv_open failed: %s\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "сбой преобразования `%s' в `%s': %s\n"
@@ -6590,17 +6595,17 @@ msgstr ""
 "Синтаксис: scdaemon [параметры] [команда [аргументы]]\n"
 "Демон смарткарт для GnuPG\n"
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 "Используйте параметр `--daemon' для запуска приложения в фоновом режиме\n"
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "обработчик fd %d запущен\n"
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "обработчик fd %d остановлен\n"
@@ -6796,7 +6801,7 @@ msgstr "[Ошибка - Нет имени]"
 msgid "[Error - invalid DN]"
 msgstr "[Ошибка - недопустимый DN]"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7107,39 +7112,39 @@ msgstr ""
 "протокол\n"
 "операция по умолчанию зависит от входных данных\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 msgid "usage: gpgsm [options] "
 msgstr "использование: gpgsm [параметры] "
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "не могу зашифровать для `%s': %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr "ВНИМАНИЕ: выполняемся с подделанным системным временем: "
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "невозможно подписать используя `%s': %s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr "данная команды всё еще не реализована\n"
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 #, fuzzy
 msgid "key generation is not available from the commandline\n"
 msgstr "gpg-agent недоступен в данной сессии\n"
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, fuzzy, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "Выберите тип создаваемого ключа:\n"
@@ -7162,7 +7167,7 @@ msgstr "ошибка базовой проверки сертификата - н
 msgid "error importing certificate: %s\n"
 msgstr "ошибка импортирования сертификата: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "ошибка чтения ввода: %s\n"
@@ -7234,7 +7239,7 @@ msgstr "неверное сформатированный отпечаток в
 msgid "invalid country code in `%s', line %d\n"
 msgstr "недопустисый код страны в `%s', строка %d\n"
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7245,7 +7250,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7253,7 +7258,7 @@ msgstr ""
 "Учтите, что для данной программы официально не одобрено создание и проверка "
 "подобных подписей.\n"
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7323,128 +7328,128 @@ msgstr ""
 "Синтаксис: gpg-connect-agent: [параметры]\n"
 "Связывается с запущенным агентом и отcылает команды\n"
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "параметр \"%s\" требует программы и опциональных аргументов\n"
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "параметр \"%s\" игнорирован по причине \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 msgid "line too long - skipped\n"
 msgstr "строка слишком длинная - пропущено\n"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, c-format
 msgid "unknown command `%s'\n"
 msgstr "неизвестная команда `%s'\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "сбой отправки строки: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "сбой получения строки: %s\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, c-format
 msgid "error sending %s command: %s\n"
 msgstr "ошибка отправки %s команды: %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "ошибка отправки стандартных параметров: %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr "Параметры контролирующие вывод диагностики"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr "Параметры контролирующие конфигурацию"
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 msgid "Options useful for debugging"
 msgstr "Параметры полезные для отладки"
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|сохранять журнал режима сервера в FILE"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr "Параметры контролирующие безопасность"
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 #, fuzzy
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|кеш PIN просрочен после N секунд"
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 #, fuzzy
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|кеш PIN просрочен после N секунд"
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr "Конфигурация серверов ключей"
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr "не проверять CRLd для корневых сертификатов"
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr "Параметры контрролирующие формат вывода"
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr "Настройки HTTP серверов"
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr "использовать системные настройки HTTP проки"
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr "Настройки LDAP серверов"
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr "Настройки OCSP"
 
@@ -7485,19 +7490,19 @@ msgstr ""
 "Синтаксис: gpgconf [параметры]\n"
 "Управляет параметрами конфигурации инструментария GnuPG\n"
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 msgid "usage: gpgconf [options] "
 msgstr "использование: gpgconf [параметры] "
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr "Требуется однокомпонентный аргумент"
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 msgid "Component not found"
 msgstr "Компонент не найден"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Команды администрирования не разрешены\n"
@@ -7555,118 +7560,118 @@ msgstr ""
 "[параметры...] COMMAND [файл-источник]\n"
 "Вызывает простой инструмент шифрования\n"
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s над %s прервано, статус %i\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "сбой %s над %s, статус %i\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "невозможно создание временного каталога `%s': %s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "невозможно открытие %s на запись: %s\n"
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, c-format
 msgid "error writing to %s: %s\n"
 msgstr "ошибка записи в %s: %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, c-format
 msgid "error reading from %s: %s\n"
 msgstr "ошибка чтения из %s: %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, c-format
 msgid "error closing %s: %s\n"
 msgstr "ошибка закрытия %s: %s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 msgid "no --program option provided\n"
 msgstr "не задан параметр --program\n"
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr "поддерживаются только параметры --decrypt и --encrypt\n"
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr "не задан параметр --keyfile\n"
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, c-format
 msgid "could not create pipe: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, c-format
 msgid "could not create pty: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, c-format
 msgid "execv failed: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, c-format
 msgid "select failed: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, c-format
 msgid "read failed: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, c-format
 msgid "pty read failed: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, c-format
 msgid "waitpid failed: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr "потомок завершился, статус %i\n"
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr "следует задать %s либо %s\n"
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr "не задан класс\n"
 
@@ -7675,5 +7680,9 @@ msgstr "не задан класс\n"
 msgid "class %s is not supported\n"
 msgstr "класс %s не поддерживается\n"
 
+#~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
+#~ msgstr ""
+#~ "расширение шифра `%s' не загружено вследствие небезопасных прав доступа\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA требует использования 160 битной хэш-функции\n"
diff --git a/po/sk.po b/po/sk.po
index 79a5f38fc..dc4565185 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+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"
@@ -13,59 +13,59 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 #, fuzzy
 msgid "PIN too long"
 msgstr "riadok je pr�li� dlh�\n"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "heslo je pr�li� dlh�\n"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Neplatn� znak ve mene\n"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 #, fuzzy
 msgid "Bad PIN"
 msgstr "nespr�vne MPI"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "nespr�vne heslo"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 #, fuzzy
 msgid "Passphrase"
 msgstr "nespr�vne heslo"
@@ -75,7 +75,7 @@ msgstr "nespr�vne heslo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
@@ -84,12 +84,12 @@ msgstr "nem��em vytvori� `%s': %s\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
@@ -188,13 +188,13 @@ msgstr ""
 "Na ochranu V�ho tajn�ho k���a mus�te zada� heslo.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "zmeni� heslo"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr ""
 
@@ -203,7 +203,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "zmeni� heslo"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -214,104 +214,104 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "s dodato�n�mi inform�ciami"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "by� o trochu tich��"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "vyh�ada� k���e na serveri k���ov"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 #, 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:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualizova� datab�zu d�very"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 #, fuzzy
@@ -320,138 +320,138 @@ msgstr ""
 "Chyby ozn�mte, pros�m, na adresu <[email protected]>.\n"
 "Pripomienky k prekladu <[email protected]>.\n"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, 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:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "chyba pri vytv�ran� `%s': %s\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nem��em vytvori� adres�r `%s': %s\n"
 
-#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "chyba pri posielan� na `%s': %s\n"
 
-#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: adres�r vytvoren�\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, 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:1359
+#: agent/gpg-agent.c:1358
 #, 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:1461
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1466
+#: agent/gpg-agent.c:1465
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483
+#: agent/gpg-agent.c:1482
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1488
+#: agent/gpg-agent.c:1487
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, 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:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: presko�en�: %s\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "zl� form�t premennej prostredia GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verzie %d nie je podporovan�\n"
@@ -478,80 +478,80 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 #, fuzzy
 msgid "Passphrase:"
 msgstr "nespr�vne heslo"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Zru�i�"
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "tajn� �asti k���a nie s� dostupn�\n"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "chyba pri ��tan�: %s\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -564,7 +564,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -574,7 +574,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr ""
 
@@ -586,19 +586,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 #, fuzzy
 msgid "Yes"
 msgstr "ano"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr ""
 
@@ -642,45 +642,45 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "chyba pri vytv�ran� `%s': %s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 #, fuzzy
 msgid "host not found"
 msgstr "[User id not found]"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nem��em sa pripoji� k `%s': %s\n"
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr "probl�m v komunik�cii s gpg-agentom\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "probl�m s agentom: agent vracia 0x%lx\n"
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "zru�en� u��vate�om\n"
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "probl�m s agentom: agent vracia 0x%lx\n"
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nem��em vypn�� vytv�ranie core s�borov: %s\n"
@@ -857,11 +857,11 @@ msgstr "VAROVANIE: n�jden� neplatn� form�t z�pisu d�tumu\n"
 msgid "not human readable"
 msgstr "nie je v priamo �itate�nom form�te"
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1179,7 +1179,7 @@ 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:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nemo�no otvori� `%s'\n"
@@ -1748,556 +1748,549 @@ msgstr "Hash: "
 msgid "Compression: "
 msgstr "Kompresia: "
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = podpis n�jden� v defin�cii skupiny \"%s\"\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "uk� v ktorom s�bore k���ov je vyp�san� k���"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZN�MKA: star� implicitn� s�bor s mo�nos�ami `%s ignorovan�'\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, 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:2266
-#, fuzzy, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr ""
-"�ifra \"%s\" nebola nahran�, preto�e pr�stupov� pr�va nie s� nastaven� "
-"bezpe�ne\n"
-
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 #, 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:2550
+#: g10/gpg.c:2527
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2530
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 msgid "invalid import options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 msgid "invalid export options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2582
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/gpg.c:2804
+#: g10/gpg.c:2781
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prep��e %s\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�va s %s zmysel!\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/gpg.c:2938
+#: g10/gpg.c:2915
 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:2944
+#: g10/gpg.c:2921
 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:2950
+#: g10/gpg.c:2927
 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:2963
+#: g10/gpg.c:2940
 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:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3041
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
 
-#: g10/gpg.c:3066
+#: g10/gpg.c:3043
 #, 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:3068
+#: g10/gpg.c:3045
 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:3070
+#: g10/gpg.c:3047
 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:3073
+#: g10/gpg.c:3050
 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:3077
+#: g10/gpg.c:3054
 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:3084
+#: g10/gpg.c:3061
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� predvo�by\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s e�te nepracuje s %s\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, 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:3186
+#: g10/gpg.c:3163
 #, 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:3191
+#: g10/gpg.c:3168
 #, 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:3283
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/gpg.c:3294
+#: g10/gpg.c:3271
 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:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [meno s�boru]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno s�boru]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno s�boru]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3329
 #, 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:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [meno s�boru]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3380
 #, 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:3423
+#: g10/gpg.c:3400
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno s�boru]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno s�boru]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno s�boru]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u��vate�a"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u��vate�a [pr�kazy]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3556
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export k���a: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa n�js� server: %s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualiz�cia servera zlyhala: %s\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[meno s�boru]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite p�sa� svoju spr�vu ...\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4184
+#: g10/gpg.c:4161
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:4217
+#: g10/gpg.c:4194
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
@@ -5208,97 +5201,97 @@ msgstr "podpis star�ho typu (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "n�jden� neplatn� kore�ov� paket v proc_tree()\n"
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "nemo�no otvori� s�bor: %s\n"
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "datab�za d�very: proced�ra read() (n=%d) zlyhala: %s\n"
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, fuzzy, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "nem��em pracova� s algoritmom verejn�ho k���a %d\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "�ifrovac� algoritmus nie je implementovan�"
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA modul pre GnuPG nen�jden�\n"
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = pros�m o viac inform�c�i\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "pou�ite namiesto neho \"%s%s\" \n"
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 msgid "Uncompressed"
 msgstr "Nekomprimovan�"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Nekomprimovan�"
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "t�to spr�va nemus� pou�ite�n� s %s\n"
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
@@ -5356,12 +5349,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hlavn� ID k���a %08lX)"
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5372,24 +5365,24 @@ msgstr ""
 "\"%.*s\"\n"
 "k��� s d�kou %u bitov, typ %s, ID %08lX, vytvoren� %s%s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 msgid "Repeat passphrase\n"
 msgstr "Opakova� heslo\n"
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 msgid "Enter passphrase\n"
 msgstr "Vlo�i� heslo\n"
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr "zru�en� u��vate�om\n"
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "probl�m s agentom: agent vracia 0x%lx\n"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5399,12 +5392,12 @@ msgstr ""
 "Mus�te pozna� heslo, aby ste odomkli tajn� k��� pre\n"
 "u��vate�a: \""
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�ka %u bitov, typ %s, ID %08lX, vytvoren� %s"
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5745,28 +5738,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:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr "Podpis oddelen� od dokumentu.\n"
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr "Pros�m, vlo�te n�zov d�tov�ho s�boru: "
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr "��tam �tandardn� vstup (stdin) ...\n"
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr "ch�baj� podp�san� d�ta\n"
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nem��em otvori� podp�san� d�ta '%s'\n"
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "nem��em otvori� podp�san� d�ta '%s'\n"
@@ -6031,12 +6024,12 @@ msgstr ""
 "predpoklad�m neplatn� podpis k���om %08lX, preto�e je nastaven� nezn�my "
 "kritick� bit\n"
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "k��� %08lX: neexistuje podk��� pre revok�ciu k���a\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "k��� %08lX: neexistuje podk��� pre viazanie podk���ov\n"
@@ -6527,17 +6520,28 @@ msgstr "nem��em otvori� `%s': %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "n�jden� chyba v programe ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "chyba pri ��tan� `%s': %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr "Viac inform�ci� n�jdete na adrese http://www.gnupg.org/faq.html\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "nemo�no otvori� s�bor: %s\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
@@ -6808,16 +6812,16 @@ msgid ""
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7025,7 +7029,7 @@ msgstr ""
 msgid "[Error - invalid DN]"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7353,40 +7357,40 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "nem��em sa pripoji� k `%s': %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nem��em zavrie� `%s': %s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 #, fuzzy
 msgid "key generation is not available from the commandline\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, fuzzy, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
@@ -7410,7 +7414,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
@@ -7483,7 +7487,7 @@ msgstr "chyba: neplatn� odtla�ok\n"
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7494,13 +7498,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7573,128 +7577,128 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "riadok je pr�li� dlh�\n"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "chyba pri posielan� na `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "chyba pri posielan� na `%s': %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|ALG|pou�i� �ifrovac� algoritmus ALG pre hesl�"
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr ""
 
@@ -7734,21 +7738,21 @@ msgid ""
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 #, fuzzy
 msgid "Component not found"
 msgstr "verejn� k��� nen�jden�"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 #, fuzzy
 msgid "No argument allowed"
 msgstr "zapisujem tajn� k��� do `%s'\n"
@@ -7807,119 +7811,119 @@ msgid ""
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "nemo�no otvori� s�bor: %s\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "nem��em vytvori� adres�r `%s': %s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, fuzzy, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "nemo�no otvori� %s: %s\n"
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "�iadne vzialen� vykon�vanie programu nie je podporovan�\n"
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr ""
 
@@ -7928,6 +7932,12 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 
+#, fuzzy
+#~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
+#~ msgstr ""
+#~ "�ifra \"%s\" nebola nahran�, preto�e pr�stupov� pr�va nie s� nastaven� "
+#~ "bezpe�ne\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA po�aduje pou�itie 160 bitov�ho hashovacieho algoritmu\n"
 
@@ -8196,9 +8206,6 @@ msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 #~ msgid "WARNING: using insecure memory!\n"
 #~ msgstr "VAROVANIE: Pou��van� pam� nie je bezpe�n�!\n"
 
-#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
-#~ msgstr "Viac inform�ci� n�jdete na adrese http://www.gnupg.org/faq.html\n"
-
 #~ msgid "operation is not possible without initialized secure memory\n"
 #~ msgstr ""
 #~ "vykonanie oper�cie nie je mo�n� bez inicializovanej bezpe�nej pam�te\n"
diff --git a/po/sv.po b/po/sv.po
index 63e108bf0..bd8262f43 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+0200\n"
 "PO-Revision-Date: 2007-02-17 13:13+0100\n"
 "Last-Translator: Daniel Nylander <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -33,12 +33,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "misslyckades med att ta kontroll över PIN-inmatningslåset: %s\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -46,44 +46,44 @@ msgstr ""
 "Ange din PIN-kod så att den hemliga nyckeln kan låsas upp för den här "
 "sessionen"
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 "Ange din lösenfras så att den hemliga nyckeln kan låsas upp för denna session"
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (försök %d av %d)"
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 msgid "PIN too long"
 msgstr "PIN-koden är för lång"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 msgid "Passphrase too long"
 msgstr "Lösenfrasen är för lång"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 msgid "Invalid characters in PIN"
 msgstr "Ogiltiga tecken i PIN-kod"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr "PIN-kod för kort"
 
 # MPI står för Multiple Precision Integer (tror jag)
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 msgid "Bad PIN"
 msgstr "Felaktig PIN-kod"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 msgid "Bad Passphrase"
 msgstr "Felaktig lösenfras"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 msgid "Passphrase"
 msgstr "Lösenfras"
 
@@ -94,7 +94,7 @@ msgstr "Lösenfras"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh-nycklar större än %d bitar stöds inte\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
@@ -103,12 +103,12 @@ msgstr "kan inte skapa \"%s\": %s\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
@@ -208,12 +208,12 @@ msgstr "Ange ny lösenfras"
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr "Ange lösenfrasen för%0Aför att skydda din nya nyckel"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 msgid "Please re-enter this passphrase"
 msgstr "Ange denna lösenfras igen"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr "stämmer inte överens - försök igen"
 
@@ -222,7 +222,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:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 msgid ""
 "@Options:\n"
@@ -231,110 +231,110 @@ msgstr ""
 "@Flaggor:\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "kör i serverläge (förgrund)"
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "kör i demonläge (bakgrund)"
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "utförlig"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "var något tystare"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "sh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "csh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|läs inställningar från FIL"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr "frigör inte från konsollen"
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr "fånga inte tangentbord och mus"
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 msgid "use a log file for the server"
 msgstr "använd en loggfil för servern"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 msgid "use a standard location for the socket"
 msgstr "använd en standardplats för uttaget"
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PRG|använd PRG som PIN-inmatningsprogrammet"
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PRG|använd PRG som SCdaemon-programmet"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "do not use the SCdaemon"
 msgstr "använd inte SCdaemon"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr "ignorera begäran om att ändra TTY"
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr "ignorera begäran om att ändra X-display"
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|låt mellanlagrad PIN-koder gå ut efter N sekunder"
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 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:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "tillåt klienter att markera nycklar som \"trusted\""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "allow presetting passphrase"
 msgstr "tillåt förinställning av lösenfras"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr "aktivera ssh-agent-emulering"
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FIL|skriv miljöinställningar även till FIL"
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 msgid "Please report bugs to <"
 msgstr "Rapportera fel till <"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Användning: gpg-agent [flaggor] (-h för hjälp)"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -342,126 +342,126 @@ msgstr ""
 "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
 "Hantering av hemliga nycklar för GnuPG\n"
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ogiltig debug-level \"%s\" angiven\n"
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, fuzzy, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "libksba är för gammal (behöver %s, har %s)\n"
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBS: inställningsfilen \"%s\" saknas\n"
 
-#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Fel när \"%s\" skapades: %s\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan inte skapa katalog: %s\n"
 
-#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr "namnet på uttaget är för långt\n"
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan inte skapa uttag: %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "fel när \"%s\" bands till uttag: %s\n"
 
-#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() misslyckades: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "lyssnar på uttaget \"%s\"\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen \"%s\" skapades\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() misslyckades för \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1359
+#: agent/gpg-agent.c:1358
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "kan inte använda \"%s\" som hemkatalog\n"
 
-#: agent/gpg-agent.c:1461
+#: agent/gpg-agent.c:1460
 #, 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:1466
+#: agent/gpg-agent.c:1465
 #, 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:1483
+#: agent/gpg-agent.c:1482
 #, 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:1488
+#: agent/gpg-agent.c:1487
 #, 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:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select misslyckades: %s - väntar 1 s\n"
 
-#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppad\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 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:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
 
-#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "GPG-Agent protokoll version %d stöds inte\n"
@@ -492,22 +492,22 @@ msgstr ""
 "Syntax: gpg-protect-tool [flaggor] [argument]\n"
 "Underhållsverktyg för hemliga nycklar\n"
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Ange lösenfrasen för att avskydda PKCS#12-objektet."
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Ange lösenfrasen för att skydda det nya PKCS#12-objektet."
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 "Ange lösenfrasen för att skydda det importerade objektet inom GnuPG-systemet."
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -515,55 +515,55 @@ msgstr ""
 "Ange lösenfrasen eller PIN-koden som\n"
 "behövs för att färdigställa denna åtgärd."
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 msgid "Passphrase:"
 msgstr "Lösenfras:"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "fel vid fråga efter lösenfrasen: %s\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 msgid "cancelled\n"
 msgstr "avbruten\n"
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, c-format
 msgid "error opening `%s': %s\n"
 msgstr "fel vid öppnandet av \"%s\": %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "fil \"%s\", rad %d: %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr "uttrycket \"%s\" ignorerat i \"%s\", rad %d\n"
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "systemets tillitslista \"%s\" är inte tillgänglig\n"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "felaktigt fingeravtryck i \"%s\", rad %d\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr "ogiltig nyckelflagga i \"%s\", rad %d\n"
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "fel vid läsning av \"%s\", rad %d: %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr "fel vid inläsning av betrodda rotcertifikat\n"
 
@@ -576,7 +576,7 @@ msgstr "fel vid inläsning av betrodda rotcertifikat\n"
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -588,7 +588,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr "Korrekt"
 
@@ -600,7 +600,7 @@ msgstr "Korrekt"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -609,11 +609,11 @@ msgstr ""
 "Litar du förbehållslöst på%%0A  \"%s\"%%0Aatt korrekt certifiera "
 "användarcertifikat?"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr "Nej"
 
@@ -658,41 +658,41 @@ msgstr "fel vid körning av \"%s\": antagligen inte installerat\n"
 msgid "error running `%s': terminated\n"
 msgstr "fel vid körning av \"%s\": avslutades\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, c-format
 msgid "error creating socket: %s\n"
 msgstr "fel när uttag skapades: %s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 msgid "host not found"
 msgstr "värden hittades inte"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr "kunde inte få tillgång till GPG-Agent i denna session\n"
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan inte ansluta till \"%s\": %s\n"
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr "kommunikationsproblem med gpg-agent\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 msgid "problem setting the gpg-agent options\n"
 msgstr "inställningsproblem för gpg-agent\n"
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 msgid "canceled by user\n"
 msgstr "avbruten av användaren\n"
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 msgid "problem with the agent\n"
 msgstr "problem med agenten\n"
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan inte stänga av minnesutskrifter: %s\n"
@@ -871,11 +871,11 @@ msgstr "VARNING: ogiltig notationsdata hittades\n"
 msgid "not human readable"
 msgstr "inte läsbart"
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr "ingen körande gpg-agent - startar en\n"
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "kan inte ansluta till agenten - försöker falla tillbaka\n"
 
@@ -1170,7 +1170,7 @@ msgid "--output doesn't work for this command\n"
 msgstr "--output kan inte användas för detta kommando\n"
 
 # se förra kommentaren
-#: g10/decrypt.c:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
@@ -1730,58 +1730,58 @@ msgstr "Kontrollsumma: "
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
 # Vad betyder detta?
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VARNING: osäkert ägarskap på hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VARNING: osäkert ägarskap på konfigurationsfilen \"%s\"\n"
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VARNING: osäkert ägarskap på tillägget \"%s\"\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VARNING: osäkra rättigheter på hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VARNING: osäkra rättigheter på konfigurationsfilen \"%s\"\n"
 
 # Extension är vad? FIXME
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VARNING: osäkra rättigheter på tillägget \"%s\"\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1789,19 +1789,19 @@ msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen \"%"
 "s\"\n"
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för tillägget \"%s\"\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1809,477 +1809,471 @@ msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen "
 "\"%s\"\n"
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för tillägget \"%s\"\n"
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "okänd konfigurationspost \"%s\"\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr "visa foto-id under nyckellistning"
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr "visa policy-url:er under signaturlistningar"
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 msgid "show all notations during signature listings"
 msgstr "visa alla notationer under signaturlistningar"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr "visa IETF-standardnotationer under signaturlistningar"
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr "visa användarangivna notationer under signaturlistningar"
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "visa url:er till föredragna nyckelservrar under signaturlistningar"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr "visa giltighet för användaridentitet vid nyckellistningar "
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 msgid "show the keyring name in key listings"
 msgstr "visa nyckelringens namn i nyckellistningar"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 msgid "show expiration dates during signature listings"
 msgstr "visa utgångsdatum under signaturlistningar"
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt är för gammalt (behöver %s, har %s)\n"
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, 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:2266
-#, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr ""
-"chiffertillägget \"%s\" lästes inte in på grund av osäkra rättigheter\n"
-
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, 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:2515
+#: g10/gpg.c:2492
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "\"%s\" är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka url till nyckelserver\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2527
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2530
 msgid "invalid keyserver options\n"
 msgstr "ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ogiltiga importeringsflaggor\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 msgid "invalid import options\n"
 msgstr "ogiltiga importflaggor\n"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ogiltiga exportflaggor\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 msgid "invalid export options\n"
 msgstr "ogiltiga exportinställningar\n"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ogiltiga listflaggor\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 msgid "invalid list options\n"
 msgstr "ogiltiga listflaggor\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr "visa foto-id under signaturvalidering"
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr "visa policy-url:er under signaturvalidering"
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 msgid "show all notations during signature verification"
 msgstr "visa alla notationer under signaturvalidering"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr "visa IETF-standardnotationer under signaturvalidering"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr "visa användarangivna notationer under signaturvalidering"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2582
 msgid "show user ID validity during signature verification"
 msgstr "visa giltighet för användaridentitet vid signaturvalidering"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
 
-#: g10/gpg.c:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr "validera signaturer med PKA-data"
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "öka tillit på signaturer med giltigt PKA-data"
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 msgid "invalid verify options\n"
 msgstr "ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, 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:2804
+#: g10/gpg.c:2781
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2784
 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:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, 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:2924
+#: g10/gpg.c:2901
 #, 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:2938
+#: g10/gpg.c:2915
 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:2944
+#: g10/gpg.c:2921
 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:2950
+#: g10/gpg.c:2927
 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:2963
+#: g10/gpg.c:2940
 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:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "vald sammandragsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 msgid "selected compression algorithm is invalid\n"
 msgstr "vald komprimeringsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 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:3062
+#: g10/gpg.c:3039
 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:3064
+#: g10/gpg.c:3041
 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:3066
+#: g10/gpg.c:3043
 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:3068
+#: g10/gpg.c:3045
 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:3070
+#: g10/gpg.c:3047
 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:3073
+#: g10/gpg.c:3050
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3054
 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:3084
+#: g10/gpg.c:3061
 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:3093
+#: g10/gpg.c:3070
 msgid "invalid personal cipher preferences\n"
 msgstr "ogiltig inställning av föredragna krypteringsalgoritmer\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 msgid "invalid personal digest preferences\n"
 msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 msgid "invalid personal compress preferences\n"
 msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, 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:3186
+#: g10/gpg.c:3163
 #, 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:3191
+#: g10/gpg.c:3168
 #, 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:3283
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3294
+#: g10/gpg.c:3271
 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:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av \"%s\" misslyckades: %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnamn]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 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:3352
+#: g10/gpg.c:3329
 #, 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:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 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:3403
+#: g10/gpg.c:3380
 #, 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:3423
+#: g10/gpg.c:3400
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3556
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export av nyckeln misslyckades: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
 
-#: g10/gpg.c:4184
+#: g10/gpg.c:4161
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
 
-#: g10/gpg.c:4217
+#: g10/gpg.c:4194
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
 
@@ -5168,95 +5162,95 @@ msgstr "signatur av den gamla (PGP 2.x) typen\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ogiltigt rotpaket hittades i proc_tree()\n"
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat för \"%s\" misslyckades i %s: %s\n"
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) misslyckades i %s: %s\n"
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "VARNING: använder experimentella algoritmen %s för publik nyckel\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "VARNING: använder experimentella chifferalgoritmen %s\n"
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "VARNING: använder experimentella sammandragsalgoritmen %s\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "VARNING: sammandragsalgoritmen %s är föråldrad\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "insticksmodul för IDEA-kryptering är inte installerat\n"
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "se %s för mer information\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: flaggan är föråldrad \"%s\"\n"
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Använd \"%s%s\" istället\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VARNING: \"%s\" är ett föråldrat kommando - använd det inte\n"
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: föråldrad flagga \"%s\" - den har ingen effekt\n"
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "VARNING: \"%s\" är en föråldrad flagga - den har ingen effekt\n"
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 msgid "Uncompressed"
 msgstr "Okomprimerad"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 msgid "uncompressed|none"
 msgstr "okomprimerad|ingen"
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "detta meddelande kanske inte kan användas av %s\n"
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "tvetydlig flagga \"%s\"\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "okänd flagga \"%s\"\n"
@@ -5313,12 +5307,12 @@ msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (primära nyckelns id %s)"
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5329,24 +5323,24 @@ msgstr ""
 "nyckeln för användaren: \"%.*s\"\n"
 "%u-bitars %s-nyckel, id %s, skapad %s%s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 msgid "Repeat passphrase\n"
 msgstr "Repetera lösenfrasen\n"
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 msgid "Enter passphrase\n"
 msgstr "Ange lösenfrasen\n"
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr "avbruten av användaren\n"
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem med agenten: %s\n"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5355,12 +5349,12 @@ msgstr ""
 "Du behöver en lösenfras för att låsa upp den hemliga\n"
 "nyckeln för användaren: \"%s\"\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bitars %s-nyckel, id %s, skapad %s"
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (undernyckel på primärt nyckel-id %s)"
@@ -5698,30 +5692,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:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr "Signatur i en separat fil.\n"
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr "Ange namnet på datafilen: "
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr "läser från standard in ...\n"
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr "ingen signerad data\n"
 
 # se förra kommentaren
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, 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:600
+#: g10/plaintext.c:601
 #, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "kan inte öppna signerad data fd=%d: %s\n"
@@ -5997,12 +5991,12 @@ msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 "antar felaktig signatur från nyckeln %s på grund av en okänd kritisk bit\n"
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "nyckel %s: ingen undernyckel med spärrsignatur för undernyckel\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "nyckeln %s: ingen undernyckel för signaturbindning av undernyckel\n"
@@ -6513,17 +6507,28 @@ msgstr "kan inte öppna fd %d: %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du har hittat ett fel i programmet ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "fel vid läsning av \"%s\": %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr "se %s för mer information\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr "konvertering från \"%s\" till \"%s\" är inte tillgänglig\n"
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open misslyckades: %s\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "konvertering från \"%s\" till \"%s\" misslyckades: %s\n"
@@ -6785,16 +6790,16 @@ msgstr ""
 "Syntax: scdaemon [flaggor] [kommando [argument]]\n"
 "Smartkortsdemon för GnuPG\n"
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr "använd flaggan \"--daemon\" för att köra programmet i bakgrunden\n"
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "hanterare för fd %d startad\n"
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "hanterare för fd %d avslutad\n"
@@ -6990,7 +6995,7 @@ msgstr "[Fel - Inget namn]"
 msgid "[Error - invalid DN]"
 msgstr "[Fel - ogiltigt DN]"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7303,38 +7308,38 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera med S/MIME-protokollet\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 msgid "usage: gpgsm [options] "
 msgstr "användning: gpgsm [flaggor] "
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "kan inte kryptera till \"%s\": %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr "VARNING: kör med falsk systemtid: "
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "importerar vanliga certifikat \"%s\"\n"
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan inte signera med \"%s\": %s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr "det här kommandot har ännu inte implementerats\n"
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 msgid "key generation is not available from the commandline\n"
 msgstr "nyckelgenerering är inte tillgänglig från kommandoraden\n"
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "använd skriptet \"%s\" för att generera en ny nyckel\n"
@@ -7357,7 +7362,7 @@ msgstr "enkla certifikatkontroller misslyckades - importeras inte\n"
 msgid "error importing certificate: %s\n"
 msgstr "fel vid import av certifikat: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "fel vid läsning av indata: %s\n"
@@ -7429,7 +7434,7 @@ msgstr "ogiltigt formaterat fingeravtryck i \"%s\", rad %d\n"
 msgid "invalid country code in `%s', line %d\n"
 msgstr "ogiltig landskod i \"%s\", rad %d\n"
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7446,7 +7451,7 @@ msgstr ""
 "\n"
 "%s%sÄr du säker på att du vill göra det här?"
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7454,7 +7459,7 @@ msgstr ""
 "Observera att den här programvaran inte officiellt godkänts för att skapa "
 "eller validera sådana signaturer.\n"
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7528,128 +7533,128 @@ msgstr ""
 "Syntax: gpg-connect-agent [flaggor]\n"
 "Anslut till en körande agent och skicka kommandon\n"
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "flaggan \"%s\" kräver ett program och valfria argument\n"
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "flaggan \"%s\" ignoreras på grund av \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 msgid "line too long - skipped\n"
 msgstr "raden är för lång - hoppades över\n"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr "rad nerkortad på grund av inbäddat Nul-tecken\n"
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, c-format
 msgid "unknown command `%s'\n"
 msgstr "okänt kommando \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "sändande rad misslyckades: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "mottagande rad misslyckades: %s\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, c-format
 msgid "error sending %s command: %s\n"
 msgstr "fel vid sändning av %s-kommando: %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "fel vid sändning av standardflaggor: %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr "Flaggor som kontrollerar diagnosutdata"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr "Flaggor som kontrollerar konfigurationen"
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 msgid "Options useful for debugging"
 msgstr "Flaggor användbara för felsökning"
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FIL|skriv serverlägesloggar till FIL"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr "Flaggor som kontrollerar säkerheten"
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 #, fuzzy
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|låt mellanlagrad PIN-koder gå ut efter N sekunder"
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 #, fuzzy
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|låt mellanlagrad PIN-koder gå ut efter N sekunder"
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr "Konfiguration för nyckelservrar"
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr "kontrollera inte spärrlistor för rotcertifikat"
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr "Flaggor som kontrollerar formatet på utdata"
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr "Flaggor som kontrollerar interaktivitet och framtvingande"
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr "Konfiguration för HTTP-servrar"
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr "använd systemets HTTP-proxyinställningar"
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr "Konfiguration av LDAP-servrar som ska användas"
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr "Konfiguration för OCSP"
 
@@ -7690,19 +7695,19 @@ msgstr ""
 "Syntax: gpgconf [flaggor]\n"
 "Hantera konfigurationsinställningar för verktygen i GnuPG-systemet\n"
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 msgid "usage: gpgconf [options] "
 msgstr "användning: gpgconf [flaggor] "
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr "Behöver ett komponentargument"
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 msgid "Component not found"
 msgstr "Komponenten hittades inte"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Administrationskommandon tillåts inte\n"
@@ -7760,118 +7765,118 @@ msgstr ""
 "[flaggor...] KOMMANDO [inmatningsfil]\n"
 "Anropa ett enkelt symmetriskt krypteringsverktyg\n"
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s på %s avbröts med status %i\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "%s på %s misslyckades med status %i\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "kan inte skapa temporärkatalogen \"%s\": %s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "kunde inte öppna %s för skrivning: %s\n"
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, c-format
 msgid "error writing to %s: %s\n"
 msgstr "fel vid skrivning till %s: %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, c-format
 msgid "error reading from %s: %s\n"
 msgstr "fel vid läsning från %s: %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, c-format
 msgid "error closing %s: %s\n"
 msgstr "fel vid stängning av %s: %s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 msgid "no --program option provided\n"
 msgstr "flaggan --program angavs inte\n"
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr "endast --decrypt och --encrypt stöds\n"
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr "flaggan --keyfile angavs inte\n"
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr "kan inte allokera argumentvektor\n"
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, c-format
 msgid "could not create pipe: %s\n"
 msgstr "kunde inte skapa rör: %s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, c-format
 msgid "could not create pty: %s\n"
 msgstr "kunde inte skapa pty: %s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, c-format
 msgid "could not fork: %s\n"
 msgstr "kunde inte grena process: %s\n"
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, c-format
 msgid "execv failed: %s\n"
 msgstr "execv misslyckades: %s\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, c-format
 msgid "select failed: %s\n"
 msgstr "val misslyckades: %s\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, c-format
 msgid "read failed: %s\n"
 msgstr "läsning misslyckades: %s\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, c-format
 msgid "pty read failed: %s\n"
 msgstr "pty-läsning misslyckades: %s\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, c-format
 msgid "waitpid failed: %s\n"
 msgstr "waitpid misslyckades: %s\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr "barnprocess avbröts med status %i\n"
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "kan inte allokera infilssträng: %s\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "kan inte allokera utfilssträng: %s\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr "antingen %s eller %s måste anges\n"
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr "ingen klass tillhandahölls\n"
 
@@ -7882,6 +7887,10 @@ msgstr "ingen klass tillhandahölls\n"
 msgid "class %s is not supported\n"
 msgstr "klassen %s stöds inte\n"
 
+#~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
+#~ msgstr ""
+#~ "chiffertillägget \"%s\" lästes inte in på grund av osäkra rättigheter\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA kräver användning av en 160-bitars hashalgoritm\n"
 
diff --git a/po/tr.po b/po/tr.po
index a5ad0ad16..6b459170f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.9.94\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+0200\n"
 "PO-Revision-Date: 2006-11-04 03:45+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -15,12 +15,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "PIN giriş kilidi edinilemedi: %s\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -28,7 +28,7 @@ msgstr ""
 "Lütfen PIN'inizi giriniz, böylelikle bu oturumda bu gizli anahtar kilitsiz "
 "olabilecek"
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -36,36 +36,36 @@ msgstr ""
 "Lütfen anahtar parolanızı giriniz, böylelikle bu oturumda bu gizli anahtar "
 "kilitsiz olabilecek"
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 msgid "PIN too long"
 msgstr "PIN çok uzun"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 msgid "Passphrase too long"
 msgstr "Anahtar Parolası çok uzun"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 msgid "Invalid characters in PIN"
 msgstr "PIN içinde geçersiz karakterler var"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr "PIN çok kısa"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 msgid "Bad PIN"
 msgstr "PIN hatalı"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 msgid "Bad Passphrase"
 msgstr "Anahtar Parolası hatalı"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 msgid "Passphrase"
 msgstr "Anahtar Parolası"
 
@@ -74,7 +74,7 @@ msgstr "Anahtar Parolası"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "%d bitlikten daha büyük SSH anahtarları desteklenmiyor\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
@@ -83,12 +83,12 @@ msgstr "\"%s\" oluşturulamıyor: %s\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
@@ -185,12 +185,12 @@ msgstr "Anahtar parolasını giriniz\n"
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr "Anahtarınızı korumak için Lütfen Anahtar Parolanızı giriniz%0A"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 msgid "Please re-enter this passphrase"
 msgstr "Lütfen bu anahtar parolasını tekrar girin"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr "aynı değiller - tekrar deneyin"
 
@@ -198,7 +198,7 @@ msgstr "aynı değiller - tekrar deneyin"
 msgid "Please enter the new passphrase"
 msgstr "Lütfen yeni anahtar parolasını girin"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 msgid ""
 "@Options:\n"
@@ -207,109 +207,109 @@ msgstr ""
 "@Seçenekler:\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "sunucu olarak (önalanda) çalışır"
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "artalan süreci olarak çalışır"
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "ayrıntılı"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "biraz daha sessiz olur"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "sh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "csh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 msgid "|FILE|read options from FILE"
 msgstr "|DOSYA|seçenekler DOSYAdan okunur"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr "konsoldan kopulmaz"
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr "klavye ve fare gaspedilmez"
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 msgid "use a log file for the server"
 msgstr "sunucu için bir günlük dosyası kullanılır"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 msgid "use a standard location for the socket"
 msgstr "soket için standart bir yer kullanılır"
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|UYG|PIN girme uygulaması olarak UYG kullanılır"
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "[UYG|Akıllı kart uygulaması olarak UYG kullanılır"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "do not use the SCdaemon"
 msgstr "Akıllı kart süreci kullanılmaz"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr "TTY değiştirme istekleri yoksayılır"
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr "X birimi değiştirme istekleri yoksayılır"
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr "imzalarken PIN arabelleği kullanılmaz"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "istemcilerin anahtarları \"güvenilir\" olarak imlemesine izin verilir"
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 msgid "allow presetting passphrase"
 msgstr "anahtar parolasının önceden atanmasına izin verilir"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr "ssh-agent öykünümü etkinleşir"
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|DOSYA|ortam ayarlarını ayrıca DOSYAya da yazar"
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 msgid "Please report bugs to <"
 msgstr "Yazılım hatalarını lütfen <"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] (yardım için -h)"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -317,126 +317,126 @@ msgstr ""
 "Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
 "GnuPG için gizli anahtar yönetimi\n"
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, fuzzy, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "libksba çok eski (gereken %s, sizinki %s)\n"
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, 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:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "`%s' oluşturulurken hata: %s\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "`%s' dizini oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr "soketin ismi çok uzun\n"
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "soket oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "soket `%s'e bağlanırken hata: %s\n"
 
-#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "soket dinleme başarısız: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "`%s' soketi dinlemede\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "dizin `%s' oluşturuldu\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, 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:1359
+#: agent/gpg-agent.c:1358
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "`%s' ev dizini olarak kullanılamıyor\n"
 
-#: agent/gpg-agent.c:1461
+#: agent/gpg-agent.c:1460
 #, 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:1466
+#: agent/gpg-agent.c:1465
 #, 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:1483
+#: agent/gpg-agent.c:1482
 #, 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:1488
+#: agent/gpg-agent.c:1487
 #, 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:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, 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:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s durdu\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 msgid "no gpg-agent running in this session\n"
 msgstr "bu oturumda çalışan gpg-agent yok\n"
 
-#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
 
-#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokolü sürüm %d desteklenmiyor\n"
@@ -466,16 +466,16 @@ msgstr ""
 "Sözdizimi: gpg-protect-tool [seçenekler] [arg ...]\n"
 "Gizli anahtar bakım aracı\n"
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 "PKCS#12 nesnesinin korumasını aşmak için lütfen anahtar parolasını giriniz."
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "PKCS#12 nesnesini korumak için lütfen anahtar parolasını giriniz."
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -483,7 +483,7 @@ msgstr ""
 "Lütfen GnuPG sistemine ithal edilen nesneyi koruyacak anahtar parolasını "
 "giriniz."
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -491,55 +491,55 @@ msgstr ""
 "Lütfen bu işlemi tamamlamak için gereken\n"
 "PIN'i veya anahtar parolasını giriniz."
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 msgid "Passphrase:"
 msgstr "Anahtar Parolası:"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "anahtar parolası sorulurken hata: %s\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 msgid "cancelled\n"
 msgstr "iptal edildi\n"
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, c-format
 msgid "error opening `%s': %s\n"
 msgstr "'%s' açılırken hata: %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "`%s' dosyası, %d. satır: %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr "`%2$s' dosyasının %3$d. satırındaki \"%1$s\" deyimi yoksayıldı\n"
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "sistem güvence listesi `%s' kullanım dışı\n"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "`%s', %d. satırda parmakizi hatalı\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr "`%s', %d. satırda anahtar bayrağı geçersiz\n"
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "`%s' okunurken %d. satırda hata: %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
 
@@ -552,7 +552,7 @@ msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -564,7 +564,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr "Doğru"
 
@@ -576,7 +576,7 @@ msgstr "Doğru"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -585,11 +585,11 @@ msgstr ""
 "Kullanıcı sertifikalarının%%0A  \"%s\"%%0Aile doğru olarak onaylanacağından "
 "son derece emin misiniz?"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "Yes"
 msgstr "Evet"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr "Hayır"
 
@@ -633,41 +633,41 @@ msgstr "`%s' çalıştırılırken hata: muhtemelen kurulu değil\n"
 msgid "error running `%s': terminated\n"
 msgstr "`%s' çalışırken hata: sonlandırıldı\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, c-format
 msgid "error creating socket: %s\n"
 msgstr "soket oluşturulurken hata: %s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 msgid "host not found"
 msgstr "konak yok"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent bu oturumda kullanılamaz\n"
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agent ile haberleşme problemi\n"
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 msgid "problem setting the gpg-agent options\n"
 msgstr "gpg-agent seçenekleri ayarlanırken sorun çıktı\n"
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 msgid "canceled by user\n"
 msgstr "kullanıcı tarafından iptal edildi\n"
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 msgid "problem with the agent\n"
 msgstr "aracı ile sorun var\n"
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "\"core\" oluşumu iptal edilemedi: %s\n"
@@ -840,11 +840,11 @@ msgstr "UYARI: geçersiz simgelem verisi bulundu\n"
 msgid "not human readable"
 msgstr "insan okuyabilir değil"
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr "çalışan gpg-agent yok - bir tane başlatılıyor\n"
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "aracıya bağlanılamıyor - son çareye başvuruluyor\n"
 
@@ -1136,7 +1136,7 @@ msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' açılamadı\n"
@@ -1690,541 +1690,536 @@ msgstr "Hash: "
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grup tanımı '%s' içinde = işareti yok\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizininde güvensiz iyelik\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz iyelik\n"
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz iyelik\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "UYARI: UYARI: '%s' evdizininde güvensiz izinler\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz izinler\n"
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz izinler\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizinindeki ilgili dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizinindeki ilgili dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr "anahtarların listelenmesi sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr "imza listelemesi sırasında poliçe URLleri gösterilir"
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 msgid "show all notations during signature listings"
 msgstr "imza listelemesi sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr "imza listelemesi sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr "imza listelemesi sırasında kullanıcı kanaklı simgelemleri gösterir"
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "imza listelemesi sırasında tercih edilen anahtar sunucusu adresi gösterilir"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr "anahtar listelemesi sırasında kullanıcı kimliği geçerliliğini gösterir"
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "anahtar listelerinde yürürlükten kaldırılmış ve zamanaşımına uğramış "
 "kullanıcı kimlikleri gösterilir"
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 "anahtar listelerinde yürürlükten kaldırılmış ve zamanaşımına uğramış "
 "yardımcı anahtarlar gösterilir"
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 msgid "show the keyring name in key listings"
 msgstr "anahtar listelerinde anahtarlık ismini gösterir"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 msgid "show expiration dates during signature listings"
 msgstr "imza listelemesi sırasında zamanaşımı tarihleri gösterilir"
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt çok eski (%s lazım, sizinki %s)\n"
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "BİLGİ: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, 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:2266
-#, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr "şifre eklentisi '%s' güvensiz izinlerden dolayı yüklenmedi\n"
-
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, 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:2515
+#: g10/gpg.c:2492
 #, 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:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2527
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2530
 msgid "invalid keyserver options\n"
 msgstr "anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 msgid "invalid list options\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr "imza doğrulaması sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr "imza doğrulaması sırasında poliçe adreslerini gösterir"
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 msgid "show all notations during signature verification"
 msgstr "imza doğrulaması sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr "imza doğrulaması sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri gösterir"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 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:2605
+#: g10/gpg.c:2582
 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:2607
+#: g10/gpg.c:2584
 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:2609
+#: g10/gpg.c:2586
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 "imza doğrulamasında yürürlükten kaldırılan ve zamanaşımına uğrayan kullanıcı "
 "kimlikleri gösterilir"
 
-#: g10/gpg.c:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr "imzaları PKA verisi ile doğrular"
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 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:2620
+#: g10/gpg.c:2597
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 msgid "invalid verify options\n"
 msgstr "doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, 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:2804
+#: g10/gpg.c:2781
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, 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:2938
+#: g10/gpg.c:2915
 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:2944
+#: g10/gpg.c:2921
 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:2950
+#: g10/gpg.c:2927
 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:2963
+#: g10/gpg.c:2940
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3041
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/gpg.c:3066
+#: g10/gpg.c:3043
 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:3068
+#: g10/gpg.c:3045
 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:3070
+#: g10/gpg.c:3047
 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:3073
+#: g10/gpg.c:3050
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3054
 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:3084
+#: g10/gpg.c:3061
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özümleme tercihleri geçersiz\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, 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:3186
+#: g10/gpg.c:3163
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' özümleme algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3191
+#: g10/gpg.c:3168
 #, 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:3283
+#: g10/gpg.c:3260
 #, 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:3294
+#: g10/gpg.c:3271
 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:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, 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:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 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:3352
+#: g10/gpg.c:3329
 #, 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:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 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:3403
+#: g10/gpg.c:3380
 #, 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:3423
+#: g10/gpg.c:3400
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, 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:3577
+#: g10/gpg.c:3554
 #, 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:3579
+#: g10/gpg.c:3556
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' çittirim algoritması geçersiz\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4184
+#: g10/gpg.c:4161
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4217
+#: g10/gpg.c:4194
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
@@ -5092,95 +5087,95 @@ msgstr "eski stil (PGP 2.x) imza\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() içinde geçersiz kök paket saptandı\n"
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "`%s' için %s de durum bilgisi alınamıyor: %s\n"
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) %s de başarısız: %s\n"
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "UYARI: deneysel %s genel anahtar algoritması kullanılıyor\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "UYARI: deneysel %s şifreleme algoritması kullanılıyor\n"
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "UYARI: deneysel %s özümleme algoritması kullanılıyor\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "UYARI: %s özümleme algoritması artık önerilmiyor.\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA şifre eklentisi yok\n"
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "daha fazla bilgi için lütfen %s adresine bakınız\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: \"%s\" seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "lütfen yerine \"%s%s\" kullanınız\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "UYARI: \"%s\" komutu artık önerilmiyor - kullanmayın onu\n"
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 msgid "Uncompressed"
 msgstr "Sıkıştırılmamış"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 msgid "uncompressed|none"
 msgstr "Sıkıştırılmamış|yok"
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "bu ileti %s tarafından kullanılamayabilir\n"
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "`%s' seçeneği belirsiz\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "`%s' seçeneği bilinmiyor\n"
@@ -5237,12 +5232,12 @@ msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (asıl anahtar kimliği %s)"
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5253,24 +5248,24 @@ msgstr ""
 "kullanıcısının gizli anahtarını açacak bir anahtar parolasına ihtiyaç var.\n"
 "%u bitlik %s anahtarı, kimlik %s, oluşturma tarihi %s%s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 msgid "Repeat passphrase\n"
 msgstr "Parolayı tekrar yazınız\n"
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 msgid "Enter passphrase\n"
 msgstr "Anahtar parolasını giriniz\n"
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr "kullanıcı tarafından durduruldu\n"
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "aracı ile sorun var: %s\n"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5279,12 +5274,12 @@ msgstr ""
 "Gizli anahtarın kilidini açmak için bir anahtar parolasına ihtiyacınız var.\n"
 "Anahtarın sahibi: \"%s\"\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u bitlik %s anahtarı, %s kimliği ile %s tarihinde üretilmiş"
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (asıl anahtar kimliği %s üzerinde yardımcı anahtar)"
@@ -5618,28 +5613,28 @@ msgstr "anahtar %s: kullanıcı kimliği yok\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "veri kaydedilmedi; kaydetmek için \"--output\" seçeneğini kullanın\n"
 
-#: g10/plaintext.c:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr "Bağımsız imza.\n"
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr "Lütfen veri dosyasının ismini girin: "
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr "standart girdiden okuyor ...\n"
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr "imzalı veri yok\n"
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imzalı veri '%s'  açılamadı\n"
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "imzalı veri '%s'  açılamadı\n"
@@ -5908,13 +5903,13 @@ msgstr ""
 "hatalı imzanın bilinmeyen bir kritik bitten dolayı %s anahtarından "
 "kaynaklandığı sanılıyor\n"
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
 "anahtar %s: anahtarı yürürlükten kaldırma imzası için yardımcı anahtar yok\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
@@ -6398,17 +6393,28 @@ msgstr "`%s' açılamıyor: %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "bir yazılım hatası buldunuz ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "\"%s\" okunurken hata: %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr "daha fazla bilgi için lütfen %s adresine bakınız\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr "`%s' > `%s' dönüşümü elverişli değil\n"
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open başarısız: %s\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "`%s' > `%s' dönüşümü başarısız: %s\n"
@@ -6670,18 +6676,18 @@ msgstr ""
 "Sözdizimi: scdaemon [seçenekler] [komut [arg ...]]\n"
 "GnuPG için akıllı kart artalan süreci\n"
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 "Programı artalanda çalışır bırakmak için lütfen `--daemon' seçeneğini "
 "kullanın\n"
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "fd %d için eylemci başlatıldı\n"
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "fd %d için eylemci sonlandı\n"
@@ -6876,7 +6882,7 @@ msgstr "[Hata - Adsız]"
 msgid "[Error - invalid DN]"
 msgstr "[Hata - DN geçersiz]"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7186,39 +7192,39 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme S/MIME protokolü kullanarak yapılır\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 msgid "usage: gpgsm [options] "
 msgstr "kullanımı: gpgsm [seçenekler] "
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "`%s'e şifrelenemez: %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "ortak sertifikalar `%s' ithal ediliyor\n"
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "`%s' kullanarak imzalanamıyor: %s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr "bu komut henüz gerçeklenmedi\n"
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 #, fuzzy
 msgid "key generation is not available from the commandline\n"
 msgstr "gpg-agent bu oturumda kullanılamaz\n"
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, fuzzy, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "Lütfen üretilecek anahtar türünü seçiniz:\n"
@@ -7241,7 +7247,7 @@ msgstr "temel sertifika sınamaları başarısız oldu - ithal edilmedi\n"
 msgid "error importing certificate: %s\n"
 msgstr "sertifika ithal edilirken hata: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "girdi okunurken hata: %s\n"
@@ -7312,7 +7318,7 @@ msgstr "`%s', %d. satırındaki biçimli parmakizi geçersiz\n"
 msgid "invalid country code in `%s', line %d\n"
 msgstr "`%s', %d. satırındaki ülke kodu geçersiz\n"
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7328,7 +7334,7 @@ msgstr ""
 "\n"
 "%s%sBunu yapmak istediğinizden emin misiniz?"
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7336,7 +7342,7 @@ msgstr ""
 "Bu yazılımın böyle imzaları oluşturmak ve doğrulamak için resmi onaylı "
 "olmadığına dikkat ediniz.\n"
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7409,128 +7415,128 @@ msgstr ""
 "Sözdizimi: gpg-connect-agent [seçenekler]\n"
 "Çalışan bir aracıya bağlanıp komutları gönderir\n"
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "\"%s\" seçeneği bir program ve seçimlik argümanlar gerektirir\n"
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "\"%2$s\" nedeniyle \"%1$s\" seçeneği yoksayıldı\n"
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 msgid "line too long - skipped\n"
 msgstr "satır çok uzun - atlandı\n"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr "gömülü boş karakterden dolayı satır kısaldı\n"
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, c-format
 msgid "unknown command `%s'\n"
 msgstr "komut `%s' bilinmiyor\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "satır göndirimi başarısız: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "satır alımı başarısız: %s\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, c-format
 msgid "error sending %s command: %s\n"
 msgstr "%s komutu gönderilirken hata: %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "standart seçenekler gönderilirken hata: %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr "Tanı çıktısını denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr "Yapılandırmayı denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 msgid "Options useful for debugging"
 msgstr "Hata ayıklamaya elverişli seçenekler"
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr "Güvenliği denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 #, fuzzy
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 #, fuzzy
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr "Anahtar sunucular için yapılandırma"
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr "PKA aramalarına izin verilir (DNS istekleri)"
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr "kök sertifikalar için CRLler sınanmaz"
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr "Çıktı biçimini denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr "Etkileşimliliği ve zorlamayı denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr "HTTP sunucuları için yapılandırma"
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr "sistemin HTTP vekil ayarları kullanılır"
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr "Kullanılacak LDAP sunucularının yapılandırması"
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr "OCSP için yapılandırma"
 
@@ -7571,19 +7577,19 @@ msgstr ""
 "Sözdizimi: gpgconf [seçenekler]\n"
 "GnuPG sisteminin araçları için yapılandırma seçeneklerini yönetir\n"
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 msgid "usage: gpgconf [options] "
 msgstr "kullanımı: gpgconf [seçenekler] "
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr "Tek bileşen argümanı gerekiyor"
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 msgid "Component not found"
 msgstr "Bileşen yok"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Yönetici komutlarına izin verilmez\n"
@@ -7641,118 +7647,118 @@ msgstr ""
 "[seçenekler...] KOMUT [girdi-dosyası]\n"
 "Basit bir simetrik şifreleme aracı çalıştırır\n"
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%2$s üzerindeki %1$s %3$i durumuyla çıktı\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "%2$s üzerindeki %1$s %3$i durumuyla başarısız oldu\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "`%s' geçici dizini oluşturulamıyor: %s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "%s yazmak için açılamadı: %s\n"
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, c-format
 msgid "error writing to %s: %s\n"
 msgstr "%s yazılırken hata: %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, c-format
 msgid "error reading from %s: %s\n"
 msgstr "%s okunurken hata: %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, c-format
 msgid "error closing %s: %s\n"
 msgstr "%s kapanırken hata: %s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 msgid "no --program option provided\n"
 msgstr "--program diye bir seçenek yok\n"
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr "sadece --decrypt ve --encrypt destekleniyor\n"
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr "--keyfile diye bir seçenek yok\n"
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr "argüman dizgeleri dizisi ayrılamıyor\n"
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, c-format
 msgid "could not create pipe: %s\n"
 msgstr "boru oluşturulamadı: %s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, c-format
 msgid "could not create pty: %s\n"
 msgstr "pty oluşturulamadı: %s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, c-format
 msgid "could not fork: %s\n"
 msgstr "çatallanamadı: %s\n"
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, c-format
 msgid "execv failed: %s\n"
 msgstr "execv başarısız: %s\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, c-format
 msgid "select failed: %s\n"
 msgstr "select başarısız: %s\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, c-format
 msgid "read failed: %s\n"
 msgstr "read başarısız: %s\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, c-format
 msgid "pty read failed: %s\n"
 msgstr "pty okuması başarısız: %s\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, c-format
 msgid "waitpid failed: %s\n"
 msgstr "waitpid başarısız: %s\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr "alt süreç %i durumu ile çıktı\n"
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "dosya içi dizge ayrılamıyor: %s\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "dosya dışı dizge ayrılamıyor: %s\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr "ya %s verilmeli ya da %s\n"
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr "hiç sınıf sağlanmamış\n"
 
@@ -7761,6 +7767,9 @@ msgstr "hiç sınıf sağlanmamış\n"
 msgid "class %s is not supported\n"
 msgstr "%s sınıfı desteklenmiyor\n"
 
+#~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
+#~ msgstr "şifre eklentisi '%s' güvensiz izinlerden dolayı yüklenmedi\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr ""
 #~ "DSA, 160 bitlik bir çittirim algoritması kullanılmasını gerektiriyor\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 39ac2db13..cdf40871a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+0200\n"
 "PO-Revision-Date: 2006-07-02 10:58+0800\n"
 "Last-Translator: Meng Jie <[email protected]>\n"
 "Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -19,59 +19,59 @@ msgstr ""
 "X-Poedit-SourceCharset: iso-8859-1\n"
 "X-Poedit-Basepath: d:\\msys\\source\\gnupg-1.4.3\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "无法存储指纹：%s\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 #, fuzzy
 msgid "PIN too long"
 msgstr "列太长"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "列太长"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "姓名含有无效的字符\n"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 #, fuzzy
 msgid "Bad PIN"
 msgstr "损坏的多精度整数(MPI)"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "错误的密码"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 #, fuzzy
 msgid "Passphrase"
 msgstr "错误的密码"
@@ -81,7 +81,7 @@ msgstr "错误的密码"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "不支持保护散列 %d\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
@@ -90,12 +90,12 @@ msgstr "无法建立‘%s’：%s\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "无法打开‘%s’： %s\n"
@@ -194,13 +194,13 @@ msgstr ""
 "您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "更改密码"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr ""
 
@@ -209,7 +209,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "更改密码"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -220,104 +220,104 @@ msgstr ""
 "选项：\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "详细模式"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "尽量减少提示信息"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "从‘%s’读取选项\n"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "在公钥服务器上搜寻密钥"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "为所选用户标识的设定注记"
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "导入后不更新信任度数据库"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 #, fuzzy
@@ -326,138 +326,138 @@ msgstr ""
 "请向 <[email protected]> 报告程序缺陷。\n"
 "请向 <[email protected]> 反映简体中文翻译的问题。\n"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意：没有默认配置文件‘%s’\n"
 
-#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "建立‘%s’时发生错误：%s\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 
-#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "已创建目录‘%s’\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) 在 %s 中出错：%s\n"
 
-#: agent/gpg-agent.c:1359
+#: agent/gpg-agent.c:1358
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1461
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1466
+#: agent/gpg-agent.c:1465
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483
+#: agent/gpg-agent.c:1482
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1488
+#: agent/gpg-agent.c:1487
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "更新私钥失败：%s\n"
 
-#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s：已跳过：%s\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
 
-#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "不支持 gpg-agent 协议版本 %d\n"
@@ -484,80 +484,80 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 #, fuzzy
 msgid "Passphrase:"
 msgstr "错误的密码"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 #, fuzzy
 msgid "cancelled\n"
 msgstr "已取消"
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "‘%s’中出错：%s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "私钥部分不可用\n"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "读取‘%s’错误：%s\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -570,7 +570,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -580,7 +580,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr ""
 
@@ -592,19 +592,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 #, fuzzy
 msgid "Yes"
 msgstr "yes"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr ""
 
@@ -648,44 +648,44 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "建立‘%s’时发生错误：%s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 #, fuzzy
 msgid "host not found"
 msgstr "[找不到用户标识]"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "无法连接至‘%s’：%s\n"
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "用户取消\n"
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "代理程序有问题――正在停用代理程序\n"
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "无法禁用核心内存转储：%s\n"
@@ -855,11 +855,11 @@ msgstr "找不到有效的 OpenPGP 数据。\n"
 msgid "not human readable"
 msgstr ""
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1151,7 +1151,7 @@ msgstr "无效的指令(尝试“help”)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "无法打开‘%s’\n"
@@ -1693,529 +1693,524 @@ msgstr "散列："
 msgid "Compression: "
 msgstr "压缩："
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "用法：gpg [选项] "
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "冲突的指令\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在‘%s’组定义里找不到等号(=)\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’权限不安全\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’权限不安全\n"
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’权限不安全\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的配置项‘%s’\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr "列出密钥时显示用户标识"
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr "列出签名时显示策略 URL"
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 msgid "show all notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr "列出签名时显示用户提供的注记"
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出密钥时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr "列出密钥时显示用户标识的有效性"
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出密钥时显示已吊销或已过期的用户标识"
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 msgid "show the keyring name in key listings"
 msgstr "列出密钥时显示钥匙环的名称"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 msgid "show expiration dates during signature listings"
 msgstr "列出签名时显示过期日期"
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "注意：一般情况下不会用到 %s！\n"
 
-#: g10/gpg.c:2266
-#, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n"
-
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "‘%s’不是一个有效的签名过期日期\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2492
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2527
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2530
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr "验证签名时显示照片标识"
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr "验证签名时显示策略 URL"
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 msgid "show all notations during signature verification"
 msgstr "验证签名时显示所有注记"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr "验证签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr "验证签名时显示用户提供的注记"
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "验证签名时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2582
 msgid "show user ID validity during signature verification"
 msgstr "验证签名时显示用户标识的有效性"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr "使用 PKA 数据验证签名的有效性"
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "提升带有有效 PKA 数据的签名的信任度"
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s：%d：无效的校验选项\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 msgid "invalid verify options\n"
 msgstr "无效的校验选项\n"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法把运行路径设成 %s\n"
 
-#: g10/gpg.c:2804
+#: g10/gpg.c:2781
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s：%d：无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr "无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程序可能会创建核心内存转储！\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 会使得 %s 失效\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不可与 %s 并用\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用无意义！\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
 
-#: g10/gpg.c:2938
+#: g10/gpg.c:2915
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2921
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下时，不能同时签名和加密\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:2927
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
 
-#: g10/gpg.c:2963
+#: g10/gpg.c:2940
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的证书散列算法无效\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 msgid "completes-needed must be greater than 0\n"
 msgstr "需要的完全可信签名数一定要大于 0\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3041
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需要的勉强可信签名数一定要大于 1\n"
 
-#: g10/gpg.c:3066
+#: g10/gpg.c:3043
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "最大验证深度一定要介于 1 和 255 之间\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3045
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3047
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3050
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3054
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3061
 msgid "invalid default preferences\n"
 msgstr "无效的默认首选项\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人对称加密算法首选项\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人散列算法首选项\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚不能和 %s 并用\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
 
-#: g10/gpg.c:3186
+#: g10/gpg.c:3163
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
 
-#: g10/gpg.c:3191
+#: g10/gpg.c:3168
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "初始化信任度数据库失败：%s\n"
 
-#: g10/gpg.c:3294
+#: g10/gpg.c:3271
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [文件名]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [文件名]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [文件名]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [文件名]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3329
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [文件名]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [文件名]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [文件名]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3380
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3400
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [文件名]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [文件名]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [文件名]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key 用户标识"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 用户标识"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 用户标识 [指令]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "上传至公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥服务器接收失败：%s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3556
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "搜寻公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "从公钥服务器更新失败：%s\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "无效的‘%s’散列算法\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[文件名]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始键入您的报文……\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的验证策略 URL 无效\n"
 
-#: g10/gpg.c:4184
+#: g10/gpg.c:4161
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签名策略 URL 无效\n"
 
-#: g10/gpg.c:4217
+#: g10/gpg.c:4194
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
@@ -4975,95 +4970,95 @@ msgstr "旧式(PGP 2.x)签名\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中检测到无效的根包\n"
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "‘%s’的 fstat 在 %s 中出错：%s\n"
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) 在 %s 中出错：%s\n"
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "警告: 使用试验性质的公钥算法 %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "警告：使用试验性质的对称加密算法 %s\n"
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "警告：使用试验性质的散列算法 %s\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "警告：不建议使用散列算法 %s\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 算法插件不存在\n"
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "请参见 %s 以得到更多信息。\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d：不建议使用该选项“%s”\n"
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告：“%s”选项已不建议使用\n"
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "请以“%s%s”代替\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "警告：“%s”命令已不建议使用——不要使用它\n"
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "警告：“%s”选项已不建议使用\n"
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 msgid "Uncompressed"
 msgstr "不压缩"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 msgid "uncompressed|none"
 msgstr "未压缩|无"
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "%s 也许不能使用这个报文\n"
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "有歧义的选项‘%s’\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "未知的选项 '%s'\n"
@@ -5119,12 +5114,12 @@ msgstr "警告：潜在不安全的对称加密会话密钥\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 类别的子包设定了关键位\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主钥匙号 %s)"
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5135,36 +5130,36 @@ msgstr ""
 "“%.*s”\n"
 "%u 位的 %s 密钥，钥匙号 %s，建立于 %s%s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 msgid "Repeat passphrase\n"
 msgstr "请再输入一次密码\n"
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 msgid "Enter passphrase\n"
 msgstr "请输入密码\n"
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr "用户取消\n"
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "代理程序有问题――正在停用代理程序\n"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
 "user: \"%s\"\n"
 msgstr "您需要输入密码，才能解开这个用户的私钥：“%s”\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u 位的 %s 密钥，钥匙号 %s，建立于 %s"
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (主钥 %s 的子钥)"
@@ -5485,28 +5480,28 @@ msgstr "密钥 %s：没有有效的用户标识\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "数据未被保存；请用“--output”选项来保存它们\n"
 
-#: g10/plaintext.c:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr "分离的签名。\n"
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr "请输入数据文件的名称： "
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr "正在从标准输入读取 ...\n"
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr "不含签名的数据\n"
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "无法打开有签名的数据‘%s’\n"
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "无法打开有签名的数据‘%s’\n"
@@ -5758,12 +5753,12 @@ msgstr "注意：签名密钥 %s 已于 %s 过期\n"
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "假定密钥 %s 的签名由于某个未知的关键位出错而损坏\n"
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "密钥 %s：没有子钥吊销签名所需的子钥\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "密钥 %s：没有子钥绑定签名所需的子钥\n"
@@ -6230,17 +6225,28 @@ msgstr "无法打开‘%s’： %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "您找到一个程序缺陷了……(%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "读取‘%s’时出错：%s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr "请访问 http://www.gnupg.org/faq.html 以获得更详细的信息\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "签名时失败： %s\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "将‘%s’重命名为‘%s’时失败：%s\n"
@@ -6503,16 +6509,16 @@ msgid ""
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6720,7 +6726,7 @@ msgstr ""
 msgid "[Error - invalid DN]"
 msgstr "错误：无效的响应。\n"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7051,40 +7057,40 @@ msgstr ""
 "签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "用法：gpg [选项] "
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "无法连接至‘%s’：%s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "无法存取‘%s’：%s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 #, fuzzy
 msgid "key generation is not available from the commandline\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, fuzzy, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "请选择您要使用的密钥种类：\n"
@@ -7108,7 +7114,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
@@ -7181,7 +7187,7 @@ msgstr "错误：指纹格式无效。\n"
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7192,13 +7198,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7271,127 +7277,127 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "列太长"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "未知的选项 '%s'\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "签名时失败： %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "无法读出公钥：%s\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr ""
 
@@ -7431,21 +7437,21 @@ msgid ""
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "用法：gpg [选项] "
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 #, fuzzy
 msgid "Component not found"
 msgstr "找不到公钥"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 #, fuzzy
 msgid "No argument allowed"
 msgstr "不允许使用管理员命令\n"
@@ -7504,119 +7510,119 @@ msgid ""
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s 不可与 %s 并用\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "‘%s’的 fstat 在 %s 中出错：%s\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "写入钥匙环‘%s’时出错： %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "‘%s’中出错：%s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "不支持远程调用\n"
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "删除密钥区块时失败：%s\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr ""
 
@@ -7625,6 +7631,9 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "不支持保护散列 %d\n"
 
+#~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
+#~ msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA 要求使用 160 位的散列算法\n"
 
@@ -7914,9 +7923,6 @@ msgstr "不支持保护散列 %d\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"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 16bc76eb4..1aa08bd7e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+0200\n"
 "PO-Revision-Date: 2005-07-29 09:49+0800\n"
 "Last-Translator: Jedi <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
@@ -17,59 +17,59 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "存放指紋失敗: %s\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 #, fuzzy
 msgid "PIN too long"
 msgstr "列太長"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "列太長"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "姓名含有無效的字符\n"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 #, fuzzy
 msgid "Bad PIN"
 msgstr "損壞的 MPI"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "錯誤的密語"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 #, fuzzy
 msgid "Passphrase"
 msgstr "錯誤的密語"
@@ -79,7 +79,7 @@ msgstr "錯誤的密語"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "保護摘要 %d 未被支援\n"
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
@@ -88,12 +88,12 @@ msgstr "無法建立 `%s': %s\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
@@ -192,13 +192,13 @@ msgstr ""
 "妳需要一個密語來保護妳的私鑰.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "更改密語"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "更改密語"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -218,242 +218,242 @@ msgstr ""
 "選項:\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "囉唆模式"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "盡量安靜些"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "從 `%s' 讀取選項\n"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "在某個金鑰伺服器上搜尋金鑰"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "設定所選使用者 ID 的偏好清單"
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "更新信任資料庫"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "請向 <[email protected]> 回報程式瑕疵.\n"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
-#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "建立 `%s' 時發生錯誤: %s\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "無法建立目錄 `%s': %s\n"
 
-#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "無法建立 `%s': %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
 
-#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "正在將私鑰寫至 `%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "目錄 `%s' 已建立\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) 失敗於 %s: %s\n"
 
-#: agent/gpg-agent.c:1359
+#: agent/gpg-agent.c:1358
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "無法建立目錄 `%s': %s\n"
 
-#: agent/gpg-agent.c:1461
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1466
+#: agent/gpg-agent.c:1465
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483
+#: agent/gpg-agent.c:1482
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1488
+#: agent/gpg-agent.c:1487
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "更新私鑰失敗: %s\n"
 
-#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: 已跳過: %s\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent 在此階段無法使用\n"
 
-#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "被變造的 GPG_AGENT_INFO 環境變數\n"
 
-#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent 協定版本 %d 未被支援\n"
@@ -480,80 +480,80 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 #, fuzzy
 msgid "Passphrase:"
 msgstr "錯誤的密語"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 #, fuzzy
 msgid "cancelled\n"
 msgstr "已取消"
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "在 `%s' 中出錯: %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "私鑰部分無法取用\n"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "讀取 `%s' 錯誤: %s\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -566,7 +566,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -576,7 +576,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr ""
 
@@ -588,19 +588,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 #, fuzzy
 msgid "Yes"
 msgstr "yes"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr ""
 
@@ -644,44 +644,44 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "建立 `%s' 時發生錯誤: %s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 #, fuzzy
 msgid "host not found"
 msgstr "[找不到使用者 ID]"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent 在此階段無法使用\n"
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "無法連接至 `%s': %s\n"
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "由使用者取消了\n"
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "代理程式的問題 - 正在停用代理程式\n"
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "無法讓系統停止傾印核心檔: %s\n"
@@ -850,11 +850,11 @@ msgstr "警告: 找到無效的標記資料\n"
 msgid "not human readable"
 msgstr "不是人類能讀得懂的"
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1146,7 +1146,7 @@ msgstr "無效的指令  (試試看 \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個命令中沒有作用\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "無法開啟 `%s'\n"
@@ -1690,536 +1690,531 @@ msgstr "雜湊: "
 msgid "Compression: "
 msgstr "壓縮: "
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "用法: gpg [選項] "
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "指令彼此矛盾\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在群組定義 `%s' 裡找不到 = 記號\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的組態項目 `%s'\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "在私鑰清單和公鑰清單間切換"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "請注意: 舊有的預設選項檔 `%s' 已被忽略\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "請注意: 一般情況下不會用到 %s!\n"
 
-#: g10/gpg.c:2266
-#, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr "編密法延伸模組 `%s' 因為權限不安全而未被載入\n"
-
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2492
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' 不是一個有效的字元集\n"
 
-#: g10/gpg.c:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖析金鑰伺服器 URI\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2527
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2530
 msgid "invalid keyserver options\n"
 msgstr "無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無效的匯入選項\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 msgid "invalid import options\n"
 msgstr "無效的匯入選項\n"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無效的匯出選項\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 msgid "invalid export options\n"
 msgstr "無效的匯出選項\n"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無效的清單選項\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 msgid "invalid list options\n"
 msgstr "無效的清單選項\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2582
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 msgid "invalid verify options\n"
 msgstr "無效的驗證選項\n"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設成 %s\n"
 
-#: g10/gpg.c:2804
+#: g10/gpg.c:2781
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程式可能會傾印出核心檔!\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %s 會使得 %s 失效\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不被允許跟 %s 併用\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 跟 %s 放在一起沒有意義!\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
 
-#: g10/gpg.c:2938
+#: g10/gpg.c:2915
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "妳祇有在 --pgp2 模式下纔能做出分離式或明文簽章\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2921
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下時, 不能同時簽署和加密\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:2927
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "啟用 --pgp2 時妳祇應該使用檔案, 而非管道\n"
 
-#: g10/gpg.c:2963
+#: g10/gpg.c:2940
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 
-#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 msgid "selected compression algorithm is invalid\n"
 msgstr "所選的壓縮演算法無效\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所選的憑證摘要演算法無效\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed 一定要大於 0\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3041
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed 一定要大於 1\n"
 
-#: g10/gpg.c:3066
+#: g10/gpg.c:3043
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3045
 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:3070
+#: g10/gpg.c:3047
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3050
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "請注意: 強烈不建議使用單純的 S2K 模式 (0)\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3054
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3061
 msgid "invalid default preferences\n"
 msgstr "無效的預設偏好\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 msgid "invalid personal cipher preferences\n"
 msgstr "無效的個人編密法偏好\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 msgid "invalid personal digest preferences\n"
 msgstr "無效的個人摘要偏好\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 msgid "invalid personal compress preferences\n"
 msgstr "無效的個人壓縮偏好\n"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 還沒辦法跟 %s 一起運作\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "妳不該將編密演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3186
+#: g10/gpg.c:3163
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "妳不該將摘要演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3191
+#: g10/gpg.c:3168
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "妳不該將壓縮演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/gpg.c:3294
+#: g10/gpg.c:3271
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [檔名]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [檔名]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' 的對稱式加密失敗: %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [檔名]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [檔名]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3329
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [檔名]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [檔名]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [檔名]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3380
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3400
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [檔名]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [檔名]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [檔名]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key 使用者ID"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 使用者ID"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 使用者ID [指令]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "送至金鑰伺服器時失敗: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺服器接收時失敗: %s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3556
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出時失敗: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "從金鑰伺服器中搜尋時失敗: %s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺服器更新時失敗: %s\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開封裝失敗: %s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行封裝失敗: %s\n"
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "無效的 `%s' 雜湊演算法\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[檔名]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "請開始鍵入妳的訊息 ...\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 msgid "the given certification policy URL is invalid\n"
 msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/gpg.c:4184
+#: g10/gpg.c:4161
 msgid "the given signature policy URL is invalid\n"
 msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/gpg.c:4217
+#: g10/gpg.c:4194
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
@@ -5011,95 +5006,95 @@ msgstr "舊型 (PGP 2.x) 簽章\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中偵測到無效的 root 封包\n"
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "`%s' 的 fstat 失敗於 %s: %s\n"
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) 失敗於 %s: %s\n"
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "警告: 正在使用實驗性的公鑰演算法 %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "警告: 正在使用實驗性的編密演算法 %s\n"
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "警告: 正在使用實驗性的摘要演算法 %s\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "警告: 摘要演算法 %s 已不建議使用\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 編密法外掛模組不存在\n"
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "請參考 http://www.gnupg.org/faq.html 上進一步的資訊\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: 不建議使用的選項 \"%s\"\n"
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告: \"%s\" 選項已不建議使用\n"
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "請改以 \"%s%s\" 代替\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "警告: \"%s\" 是個被反對使用的指令 - 別再用了\n"
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "警告: \"%s\" 選項已不建議使用\n"
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 msgid "Uncompressed"
 msgstr "未被壓縮"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 msgid "uncompressed|none"
 msgstr "uncompressed|none|未被壓縮|無"
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "這個訊息對 %s 來說無法使用\n"
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "不明確的選項 `%s'\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "未知的選項 `%s'\n"
@@ -5155,12 +5150,12 @@ msgstr "警告: 以可能並不安全的對稱式加密過的階段金鑰\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 類別的子封包設定了關鍵位元\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主要金鑰 ID %s)"
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5171,24 +5166,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u 位元長的 %s 金鑰, ID %s, 建立於 %s%s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 msgid "Repeat passphrase\n"
 msgstr "請再輸入一次密語\n"
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 msgid "Enter passphrase\n"
 msgstr "請輸入密語\n"
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr "由使用者取消了\n"
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "代理程式的問題 - 正在停用代理程式\n"
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5197,12 +5192,12 @@ msgstr ""
 "妳需要用密語來解開下列使用者的\n"
 "私鑰: \"%s\"\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u 位元長的 %s 金鑰, ID %s, 建立於 %s"
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (在主鑰 ID %s 上的子鑰)"
@@ -5525,28 +5520,28 @@ msgstr "金鑰 %s 沒有使用者 ID\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "資料未被儲存; 請用 \"--output\" 選項來儲存它們\n"
 
-#: g10/plaintext.c:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr "分離的簽章.\n"
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr "請輸入資料檔的名稱: "
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr "正在從標準輸入讀取 ...\n"
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr "沒有被簽署過的資料\n"
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "無法開啟被簽署過的資料 `%s'\n"
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "無法開啟被簽署過的資料 `%s'\n"
@@ -5801,12 +5796,12 @@ msgstr "請注意: 簽章金鑰 %s 已於 %s 過期\n"
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "假設金鑰 %s 的損壞簽章導因於某個未知的關鍵位元\n"
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "金鑰 %s: 沒有子鑰可供子鑰撤銷簽章使用\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "金鑰 %s: 沒有子鑰可供附子鑰簽章之用\n"
@@ -6272,17 +6267,28 @@ msgstr "無法開啟 `%s': %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "妳找到一個瑕疵了 ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "讀取 `%s' 時發生錯誤: %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr "請參考 http://www.gnupg.org/faq.html 上進一步的資訊\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "簽署時失敗了: %s\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "把 `%s' 重新新命成 `%s' 時失敗: %s\n"
@@ -6543,16 +6549,16 @@ msgid ""
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6760,7 +6766,7 @@ msgstr ""
 msgid "[Error - invalid DN]"
 msgstr "錯誤: 無效的回應.\n"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7091,40 +7097,40 @@ msgstr ""
 "簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "用法: gpg [選項] "
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "無法連接至 `%s': %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "無法存取 `%s': %s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 #, fuzzy
 msgid "key generation is not available from the commandline\n"
 msgstr "gpg-agent 在此階段無法使用\n"
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, fuzzy, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "請選擇妳要產生的金鑰種類:\n"
@@ -7148,7 +7154,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
@@ -7221,7 +7227,7 @@ msgstr "錯誤: 指紋格式化無效.\n"
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7232,13 +7238,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7311,127 +7317,127 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "列太長"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "未知的選項 `%s'\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "簽署時失敗了: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "讀取公鑰時失敗: %s\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr ""
 
@@ -7471,21 +7477,21 @@ msgid ""
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "用法: gpg [選項] "
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 #, fuzzy
 msgid "Component not found"
 msgstr "找不到公鑰"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 #, fuzzy
 msgid "No argument allowed"
 msgstr "未允許使用管理者指令\n"
@@ -7544,119 +7550,119 @@ msgid ""
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s 不被允許跟 %s 併用\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "`%s' 的 fstat 失敗於 %s: %s\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "無法建立目錄 `%s': %s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "寫到鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "在 `%s' 中出錯: %s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "沒有已支援的遠端程式執行\n"
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "無法建立 `%s': %s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "無法建立 `%s': %s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "刪除金鑰區塊時失敗了: %s\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "無法建立備份檔案 `%s': %s\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "無法建立備份檔案 `%s': %s\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr ""
 
@@ -7665,6 +7671,9 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "保護摘要 %d 未被支援\n"
 
+#~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
+#~ msgstr "編密法延伸模組 `%s' 因為權限不安全而未被載入\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA 要求使用 160 位元的雜湊演算法\n"
 
@@ -7954,9 +7963,6 @@ msgstr "保護摘要 %d 未被支援\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"
 
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 680a96c79..4f08ff62c 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-15  Werner Koch  <[email protected]>
+
+	* Makefile.am (symcryptrun_LDADD): It is LIBICONV and not LIBINCONV.
+	(gpgconf_LDADD, symcryptrun_LDADD): Add W32SOCKLIBS.
+
 2007-06-14  Werner Koch  <[email protected]>
 
 	* symcryptrun.c (main): Setup default socket name for
diff --git a/tools/Makefile.am b/tools/Makefile.am
index ed967ecb8..d085b9e09 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -62,14 +62,15 @@ gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c no-libgcrypt.c
 # jnlib/common sucks in gpg-error, will they, nil they (some compilers
 # do not eliminate the supposed-to-be-unused-inline-functions).
 gpgconf_LDADD = $(common_libs) \
-                $(LIBINTL) $(GPG_ERROR_LIBS) $(LIBICONV)
+                $(LIBINTL) $(GPG_ERROR_LIBS) $(LIBICONV) $(W32SOCKLIBS)
 
 gpgparsemail_SOURCES = gpgparsemail.c rfc822parse.c rfc822parse.h
 gpgparsemail_LDADD = 
 
 symcryptrun_SOURCES = symcryptrun.c
 symcryptrun_LDADD = $(LIBUTIL_LIBS) $(common_libs) $(pwquery_libs) \
-                    $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBINCONV)
+                    $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) \
+                    $(LIBICONV) $(W32SOCKLIBS)
 
 watchgnupg_SOURCES = watchgnupg.c 
 watchgnupg_LDADD = $(NETLIBS)
author	Werner Koch <[email protected]>	2007-06-15 14:27:31 +0000
committer	Werner Koch <[email protected]>	2007-06-15 14:27:31 +0000
commit	915b7b21fdb2d84ef55542681f418690dd8832db (patch)
tree	43c4b7465e0120d6b63591b0c61b3338030f65f7
parent	2007-06-15 Marcus Brinkmann <[email protected]> (diff)
download	gnupg-915b7b21fdb2d84ef55542681f418690dd8832db.tar.gz gnupg-915b7b21fdb2d84ef55542681f418690dd8832db.zip