diff --git a/TODO b/TODO
index dafe3e74a..78068358b 100644
--- a/TODO
+++ b/TODO
@@ -63,7 +63,11 @@
   would be better to do this just at one place. First we need to see
   how we can support cards with multiple applications.
 ** Resolve fixme in do_sign of app-dinsig.
+** Disconnect 
+  Card timeout is currently used as a boolean.  
+  Add disconnect support for the ccid driver.
 
+* Regression tests
 ** Add a regression test to check the extkeyusage.
 
 * Windows port (W32)
@@ -75,8 +79,6 @@
 * sm/
 ** check that we issue NO_SECKEY xxx if a -u key was not found
    We don't. The messages returned are also wrong (recipient vs. signer).
-** gpgsm_format_name2
-   Replace by an estream based implementation.
 
 * jnlib/
 ** Try to remove all jnlib_xmalloc.
diff --git a/agent/ChangeLog b/agent/ChangeLog
index b8f30e879..db96f11d3 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-05  Werner Koch  <wk@g10code.com>
+
+	* minip12.c (decrypt_block): Fix const modified of CHARSETS.
+	* learncard.c (sinfo_cb_parm_s): Remove superflous semicolon.
+	Reported by Stoyan Angelov.
+
 2008-11-18  Werner Koch  <wk@g10code.com>
 
 	* gpg-agent.c (make_libversion): New.
diff --git a/agent/learncard.c b/agent/learncard.c
index 946319432..eab5bd47e 100644
--- a/agent/learncard.c
+++ b/agent/learncard.c
@@ -76,7 +76,7 @@ struct sinfo_s {
 typedef struct sinfo_s *SINFO;  
 
 struct sinfo_cb_parm_s {
-  int error;;
+  int error;
   SINFO info;
 };
 
diff --git a/agent/minip12.c b/agent/minip12.c
index f9e9f3169..6b65c8c36 100644
--- a/agent/minip12.c
+++ b/agent/minip12.c
@@ -498,7 +498,7 @@ decrypt_block (const void *ciphertext, unsigned char *plaintext, size_t length,
                int iter, const char *pw, int cipher_algo,
                int (*check_fnc) (const void *, size_t))
 {
-  static const char const *charsets[] = {
+  static const char * const charsets[] = {
     "",   /* No conversion - use the UTF-8 passphrase direct.  */
     "ISO-8859-1",
     "ISO-8859-15",
diff --git a/autogen.sh b/autogen.sh
index 31caf240f..a7e701550 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -209,5 +209,5 @@ echo "Running autoconf${FORCE} ..."
 $AUTOCONF${FORCE}
 
 echo "You may now run: 
-  ./configure --sysconfdir=/etc --enable-maintainer-mode && make
+  ./configure --sysconfdir=/etc --enable-maintainer-mode --enable-symcryptrun --enable-mailto && make
 "
diff --git a/common/ChangeLog b/common/ChangeLog
index c1ae39b6b..b1390d599 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-05  Werner Koch  <wk@g10code.com>
+
+	* exechelp.c (gnupg_spawn_process, gnupg_spawn_process_fd) 
+	(gnupg_spawn_process_detached) [W32]: Remove debug output.
+
 2008-11-20  Werner Koch  <wk@g10code.com>
 
 	* audit.c (writeout_li): Translate OKTEXT.
diff --git a/common/exechelp.c b/common/exechelp.c
index 2246c78ea..bb9ddd557 100644
--- a/common/exechelp.c
+++ b/common/exechelp.c
@@ -396,7 +396,7 @@ gnupg_spawn_process (const char *pgmname, const char *argv[],
               | ((flags & 128)? DETACHED_PROCESS : 0)
               | GetPriorityClass (GetCurrentProcess ())
               | CREATE_SUSPENDED); 
-  log_debug ("CreateProcess, path=`%s' cmdline=`%s'\n", pgmname, cmdline);
+/*   log_debug ("CreateProcess, path=`%s' cmdline=`%s'\n", pgmname, cmdline); */
   if (!CreateProcess (pgmname,       /* Program to start.  */
                       cmdline,       /* Command line arguments.  */
                       &sec_attr,     /* Process security attributes.  */
@@ -421,10 +421,10 @@ gnupg_spawn_process (const char *pgmname, const char *argv[],
   /* Close the other end of the pipe.  */
   CloseHandle (fd_to_handle (rp[1]));
   
-  log_debug ("CreateProcess ready: hProcess=%p hThread=%p"
-             " dwProcessID=%d dwThreadId=%d\n",
-             pi.hProcess, pi.hThread,
-             (int) pi.dwProcessId, (int) pi.dwThreadId);
+/*   log_debug ("CreateProcess ready: hProcess=%p hThread=%p" */
+/*              " dwProcessID=%d dwThreadId=%d\n", */
+/*              pi.hProcess, pi.hThread, */
+/*              (int) pi.dwProcessId, (int) pi.dwThreadId); */
 
   /* Process has been created suspended; resume it now. */
   ResumeThread (pi.hThread);
@@ -558,7 +558,7 @@ gnupg_spawn_process_fd (const char *pgmname, const char *argv[],
   si.hStdOutput = outfd == -1? stdhd[1] : (void*)_get_osfhandle (outfd);
   si.hStdError  = errfd == -1? stdhd[2] : (void*)_get_osfhandle (errfd);
 
-  log_debug ("CreateProcess, path=`%s' cmdline=`%s'\n", pgmname, cmdline);
+/*   log_debug ("CreateProcess, path=`%s' cmdline=`%s'\n", pgmname, cmdline); */
   if (!CreateProcess (pgmname,       /* Program to start.  */
                       cmdline,       /* Command line arguments.  */
                       &sec_attr,     /* Process security attributes.  */
@@ -585,10 +585,10 @@ gnupg_spawn_process_fd (const char *pgmname, const char *argv[],
   if (err)
     return err;
 
-  log_debug ("CreateProcess ready: hProcess=%p hThread=%p"
-             " dwProcessID=%d dwThreadId=%d\n",
-             pi.hProcess, pi.hThread,
-             (int) pi.dwProcessId, (int) pi.dwThreadId);
+/*   log_debug ("CreateProcess ready: hProcess=%p hThread=%p" */
+/*              " dwProcessID=%d dwThreadId=%d\n", */
+/*              pi.hProcess, pi.hThread, */
+/*              (int) pi.dwProcessId, (int) pi.dwThreadId); */
 
   /* Process has been created suspended; resume it now. */
   ResumeThread (pi.hThread);
@@ -796,8 +796,8 @@ gnupg_spawn_process_detached (const char *pgmname, const char *argv[],
               | GetPriorityClass (GetCurrentProcess ())
               | CREATE_NEW_PROCESS_GROUP
               | DETACHED_PROCESS); 
-  log_debug ("CreateProcess(detached), path=`%s' cmdline=`%s'\n",
-             pgmname, cmdline);
+/*   log_debug ("CreateProcess(detached), path=`%s' cmdline=`%s'\n", */
+/*              pgmname, cmdline); */
   if (!CreateProcess (pgmname,       /* Program to start.  */
                       cmdline,       /* Command line arguments.  */
                       &sec_attr,     /* Process security attributes.  */
@@ -817,10 +817,10 @@ gnupg_spawn_process_detached (const char *pgmname, const char *argv[],
   xfree (cmdline);
   cmdline = NULL;
 
-  log_debug ("CreateProcess(detached) ready: hProcess=%p hThread=%p"
-             " dwProcessID=%d dwThreadId=%d\n",
-             pi.hProcess, pi.hThread,
-             (int) pi.dwProcessId, (int) pi.dwThreadId);
+/*   log_debug ("CreateProcess(detached) ready: hProcess=%p hThread=%p" */
+/*              " dwProcessID=%d dwThreadId=%d\n", */
+/*              pi.hProcess, pi.hThread, */
+/*              (int) pi.dwProcessId, (int) pi.dwThreadId); */
 
   CloseHandle (pi.hThread); 
 
diff --git a/doc/scdaemon.texi b/doc/scdaemon.texi
index df9d01a77..d8724ced8 100644
--- a/doc/scdaemon.texi
+++ b/doc/scdaemon.texi
@@ -252,6 +252,20 @@ echo scd getinfo reader_list | gpg-connect-agent --decode | awk '/^D/ @{print $2
 @end smallexample
 
 
+@item --card-timeout @var{n}
+@opindex card-timeout
+If @var{n} is not 0 and no client is actively using the card, the card
+will be powered down after @var{n} seconds.  Powering down the card
+avoids a potential risk of damaging a card when used with certain
+cheap readers.  This also allows non Scdaemon aware applications to
+access the card.  The disadvantage of using a card timeout is that
+accessing the card takes longer and that the user needs to enter the
+PIN again after the next power up.
+
+Note that with the current version of Scdaemon the card is powered
+down immediatley at the next timer tick for any value of @var{n} other
+than 0.
+
 
 @item --disable-keypad
 @opindex disable-keypad
diff --git a/po/be.po b/po/be.po
index f16144fcd..0eae79428 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2003-10-30 16:35+0200\n"
 "Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -91,7 +91,7 @@ msgstr "дрэнны пароль"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -101,12 +101,12 @@ msgstr ""
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr ""
@@ -318,11 +318,12 @@ msgstr ""
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr ""
 
@@ -330,7 +331,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr ""
 
@@ -384,163 +385,163 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Калі ласка, паведамляйце пра памылкі на <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: agent/gpg-agent.c:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: тэчка створана\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: agent/gpg-agent.c:1513
+#: agent/gpg-agent.c:1538
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1670
+#: agent/gpg-agent.c:1695
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1690
+#: agent/gpg-agent.c:1715
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1695
+#: agent/gpg-agent.c:1720
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, c-format
 msgid "%s %s stopped\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -680,12 +681,12 @@ msgid ""
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 #, fuzzy
 msgid "Yes"
 msgstr "yes [так]"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr ""
 
@@ -866,125 +867,125 @@ msgstr ""
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
-#: common/audit.c:684
+#: common/audit.c:692
 #, fuzzy
 msgid "Certificate chain available"
 msgstr "дрэнны сэртыфікат"
 
-#: common/audit.c:691
+#: common/audit.c:699
 #, fuzzy
 msgid "root certificate missing"
 msgstr "дрэнны сэртыфікат"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr ""
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 #, fuzzy
 msgid "Data available"
 msgstr "Даведка адсутнічае"
 
-#: common/audit.c:725
+#: common/audit.c:733
 #, fuzzy
 msgid "Session key created"
 msgstr "%s: створаны зьвязак ключоў\n"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, c-format
 msgid "algorithm: %s"
 msgstr ""
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
 "\n"
 "Альгарытмы, якія падтрымліваюцца:\n"
 
-#: common/audit.c:736
+#: common/audit.c:744
 msgid "seems to be not encrypted"
 msgstr ""
 
-#: common/audit.c:742
+#: common/audit.c:750
 msgid "Number of recipients"
 msgstr ""
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr ""
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr ""
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr ""
 
-#: common/audit.c:823
+#: common/audit.c:831
 msgid "Data verification succeeded"
 msgstr ""
 
-#: common/audit.c:832
+#: common/audit.c:840
 #, fuzzy
 msgid "Signature available"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: common/audit.c:837
+#: common/audit.c:845
 #, fuzzy
 msgid "Parsing signature succeeded"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, fuzzy, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, fuzzy, c-format
 msgid "Signature %d"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: common/audit.c:873
+#: common/audit.c:881
 #, fuzzy
 msgid "Certificate chain valid"
 msgstr "Гэты ключ згубіў састарэў!"
 
-#: common/audit.c:884
+#: common/audit.c:892
 #, fuzzy
 msgid "Root certificate trustworthy"
 msgstr "дрэнны сэртыфікат"
 
-#: common/audit.c:894
+#: common/audit.c:902
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "дрэнны сэртыфікат"
 
-#: common/audit.c:911
+#: common/audit.c:919
 #, fuzzy
 msgid "Included certificates"
 msgstr "дрэнны сэртыфікат"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 #, fuzzy
 msgid "Unknown operation"
 msgstr "невядомая вэрсыя"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, fuzzy, c-format
 msgid "No help available for `%s'."
 msgstr "Для \"%s\" даведка адсутнічае"
@@ -1419,7 +1420,7 @@ msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
@@ -1930,15 +1931,15 @@ msgstr ""
 " --list-keys [назвы]        паказаць ключы\n"
 " --fingerprint [назвы]      паказаць адбіткі пальцаў\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Калі ласка, паведамляйце пра памылкі на <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1948,7 +1949,7 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1956,551 +1957,547 @@ msgstr ""
 "\n"
 "Альгарытмы, якія падтрымліваюцца:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 msgid "Compression: "
 msgstr ""
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr ""
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1345
+#: g10/gpg.c:1324
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1348
+#: g10/gpg.c:1327
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1351
+#: g10/gpg.c:1330
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1357
+#: g10/gpg.c:1336
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1360
+#: g10/gpg.c:1339
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1363
+#: g10/gpg.c:1342
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1369
+#: g10/gpg.c:1348
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1351
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1354
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1360
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1363
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1366
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1566
+#: g10/gpg.c:1545
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 msgid "show the keyring name in key listings"
 msgstr ""
 
-#: g10/gpg.c:1688
+#: g10/gpg.c:1667
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 
-#: g10/gpg.c:1940
+#: g10/gpg.c:1919
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/gpg.c:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2599
+#: g10/gpg.c:2578
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2613
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2616
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 msgid "invalid import options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 msgid "invalid export options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2670
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2672
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2683
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2868
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "запіс у stdout\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3023
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3029
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3056
+#: g10/gpg.c:3035
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:3069
+#: g10/gpg.c:3048
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3170
+#: g10/gpg.c:3149
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3151
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3174
+#: g10/gpg.c:3153
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3176
+#: g10/gpg.c:3155
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3158
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/gpg.c:3183
+#: g10/gpg.c:3162
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3190
+#: g10/gpg.c:3169
 msgid "invalid default preferences\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3271
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3276
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3359
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3391
+#: g10/gpg.c:3370
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [назва_файла]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва_файла]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва_файла]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3428
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [назва_файла]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3500
+#: g10/gpg.c:3479
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3499
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва_файла]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва_файла]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва_файла]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [загады]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3683
+#: g10/gpg.c:3662
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[назва_файла]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4267
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4321
+#: g10/gpg.c:4300
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
 
@@ -2517,12 +2514,12 @@ msgstr ""
 msgid "|FD|write status info to this FD"
 msgstr ""
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6591,58 +6588,66 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111
-msgid "read options from file"
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
+msgid "|FILE|write a log to FILE"
+msgstr ""
+
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "несумяшчальныя загады\n"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7319,10 +7324,6 @@ msgstr "|НАЗВА|     задаць назву дапомнага сакрэт
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|ВУЗЕЛ|     выкарыстоўваць гэты паслужнік для пошуку ключоў"
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr ""
-
 #: sm/gpgsm.c:328
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
@@ -7333,12 +7334,12 @@ msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7349,60 +7350,60 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: sm/gpgsm.c:629
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr ""
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr ""
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7677,8 +7678,8 @@ msgstr ""
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index 2e9e1271e..353520e70 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -113,7 +113,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:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -123,12 +123,12 @@ msgstr "no s'ha pogut crear «%s»: %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
@@ -345,12 +345,13 @@ msgstr ""
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr ""
 
@@ -358,7 +359,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cerca claus en un servidor de claus"
@@ -415,165 +416,165 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Si us plau, informeu sobre els errors a <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 #, 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:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, 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:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: agent/gpg-agent.c:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "Certificat de revocació vàlid"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: agent/gpg-agent.c:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: s'ha creat el directori\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, 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:1513
+#: agent/gpg-agent.c:1538
 #, 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:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1670
+#: agent/gpg-agent.c:1695
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1690
+#: agent/gpg-agent.c:1715
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1695
+#: agent/gpg-agent.c:1720
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, 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:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu claus es descarta\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: agent/gpg-agent.c:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
 
-#: agent/gpg-agent.c:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -717,12 +718,12 @@ msgid ""
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 #, fuzzy
 msgid "Yes"
 msgstr "sí|si"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr ""
 
@@ -908,35 +909,35 @@ msgstr ""
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
-#: common/audit.c:684
+#: common/audit.c:692
 #, fuzzy
 msgid "Certificate chain available"
 msgstr "Certificat de revocació vàlid"
 
-#: common/audit.c:691
+#: common/audit.c:699
 #, fuzzy
 msgid "root certificate missing"
 msgstr ""
 "No s'han trobat certificats amb confiança no definida.\n"
 "\n"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr ""
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 #, fuzzy
 msgid "Data available"
 msgstr "La clau és disponible en: "
 
 # Fitxer indi fins final.  Hau!  ivb
 # Grrr. Com em tracten els esclaus ja... jm
-#: common/audit.c:725
+#: common/audit.c:733
 #, fuzzy
 msgid "Session key created"
 msgstr "%s: s'ha creat l'anell\n"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, fuzzy, c-format
 msgid "algorithm: %s"
 msgstr "armadura: %s\n"
@@ -946,7 +947,7 @@ msgstr "armadura: %s\n"
 # Precissament acabem de parlar d'«implementat a la llista del GNOME
 # i s'ha dit que és erroni, igual que «suportat» :) Les alternatives
 # encara no m'agraden massa... jm
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -956,93 +957,93 @@ msgstr ""
 # Gènere?  Nombre?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: common/audit.c:736
+#: common/audit.c:744
 #, fuzzy
 msgid "seems to be not encrypted"
 msgstr "no és xifrat"
 
-#: common/audit.c:742
+#: common/audit.c:750
 msgid "Number of recipients"
 msgstr ""
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr ""
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr ""
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr ""
 
-#: common/audit.c:823
+#: common/audit.c:831
 #, fuzzy
 msgid "Data verification succeeded"
 msgstr "s'ha eliminat la verificació de signatura\n"
 
-#: common/audit.c:832
+#: common/audit.c:840
 #, fuzzy
 msgid "Signature available"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: common/audit.c:837
+#: common/audit.c:845
 #, fuzzy
 msgid "Parsing signature succeeded"
 msgstr "Signatura correcta de \""
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, fuzzy, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, fuzzy, c-format
 msgid "Signature %d"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: common/audit.c:873
+#: common/audit.c:881
 #, fuzzy
 msgid "Certificate chain valid"
 msgstr "Certificat de revocació vàlid"
 
-#: common/audit.c:884
+#: common/audit.c:892
 #, fuzzy
 msgid "Root certificate trustworthy"
 msgstr ""
 "No s'han trobat certificats amb confiança no definida.\n"
 "\n"
 
-#: common/audit.c:894
+#: common/audit.c:902
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "Certificat correcte"
 
-#: common/audit.c:911
+#: common/audit.c:919
 #, fuzzy
 msgid "Included certificates"
 msgstr "Certificat invàlid"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 #, fuzzy
 msgid "Unknown operation"
 msgstr "la versió és desconeguda"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, fuzzy, c-format
 msgid "No help available for `%s'."
 msgstr "No hi ha ajuda disponible per a `%s'"
@@ -1501,7 +1502,7 @@ msgstr "L'ordre no és vàlida (proveu «help»)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no s'ha pogut obrir «%s»\n"
@@ -2051,15 +2052,15 @@ msgstr ""
 " --list-keys [noms]         mostra claus\n"
 " --fingerprint [noms]       mostra empremtes digitals\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Si us plau, informeu sobre els errors a <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2074,7 +2075,7 @@ msgstr ""
 # Precissament acabem de parlar d'«implementat a la llista del GNOME
 # i s'ha dit que és erroni, igual que «suportat» :) Les alternatives
 # encara no m'agraden massa... jm
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2082,570 +2083,566 @@ msgstr ""
 "\n"
 "Algoritmes suportats:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr "Clau pública: "
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr "Xifratge: "
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr "Dispersió: "
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 msgid "Compression: "
 msgstr "Compressió: "
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr ""
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, 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:1345
+#: g10/gpg.c:1324
 #, 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:1348
+#: g10/gpg.c:1327
 #, 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:1351
+#: g10/gpg.c:1330
 #, 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:1357
+#: g10/gpg.c:1336
 #, 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:1360
+#: g10/gpg.c:1339
 #, 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:1363
+#: g10/gpg.c:1342
 #, 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:1369
+#: g10/gpg.c:1348
 #, 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:1372
+#: g10/gpg.c:1351
 #, 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:1375
+#: g10/gpg.c:1354
 #, 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:1381
+#: g10/gpg.c:1360
 #, 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:1384
+#: g10/gpg.c:1363
 #, 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:1387
+#: g10/gpg.c:1366
 #, 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:1566
+#: g10/gpg.c:1545
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 #, 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:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra en quin anell de claus està una clau llistada"
 
-#: g10/gpg.c:1688
+#: g10/gpg.c:1667
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, 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:1940
+#: g10/gpg.c:1919
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s no és per a ús normal!\n"
 
-#: g10/gpg.c:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, 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:2599
+#: g10/gpg.c:2578
 #, 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:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 #, 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:2634
+#: g10/gpg.c:2613
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2616
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 msgid "invalid import options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 msgid "invalid export options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 #, 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:2689
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2670
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2672
 #, 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:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2683
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, 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:2889
+#: g10/gpg.c:2868
 #, 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:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 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:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVÍS: %s té preferència sobre %s\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no té sentit amb %s!\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, 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:3044
+#: g10/gpg.c:3023
 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:3050
+#: g10/gpg.c:3029
 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:3056
+#: g10/gpg.c:3035
 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:3069
+#: g10/gpg.c:3048
 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:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/gpg.c:3170
+#: g10/gpg.c:3149
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3151
 #, 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:3174
+#: g10/gpg.c:3153
 #, 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:3176
+#: g10/gpg.c:3155
 #, 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:3179
+#: g10/gpg.c:3158
 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:3183
+#: g10/gpg.c:3162
 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:3190
+#: g10/gpg.c:3169
 msgid "invalid default preferences\n"
 msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 msgid "invalid personal cipher preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 msgid "invalid personal digest preferences\n"
 msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 msgid "invalid personal compress preferences\n"
 msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, 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:3292
+#: g10/gpg.c:3271
 #, 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:3297
+#: g10/gpg.c:3276
 #, 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:3380
+#: g10/gpg.c:3359
 #, 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:3391
+#: g10/gpg.c:3370
 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:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3428
 #, 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:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3500
+#: g10/gpg.c:3479
 #, 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:3520
+#: g10/gpg.c:3499
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3683
+#: g10/gpg.c:3662
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 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:4288
+#: g10/gpg.c:4267
 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:4321
+#: g10/gpg.c:4300
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
@@ -2663,12 +2660,12 @@ msgstr "fes els conflictes de marques de temps només un avís"
 msgid "|FD|write status info to this FD"
 msgstr "|FD|escriu informació d'estat en aquest FD"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpgv [opcions] [fitxers] (-h per a veure l'ajuda)"
 
 # Werner FIXME: should it use «Usage»?
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -7081,60 +7078,68 @@ msgstr "Introduïu el nom d'usuari: "
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111
-#, fuzzy
-msgid "read options from file"
-msgstr "s'estan llegint opcions de «%s»\n"
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
+#, fuzzy
+msgid "|FILE|write a log to FILE"
+msgstr "|FITXER|carrega el mòdul d'extensió especificat"
+
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "no usa el terminal en absolut"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "les ordres entren en conflicte\n"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7849,10 +7854,6 @@ msgstr "|NOM|usa NOM com a clau secreta predeterminada"
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|usa aquest servidor per a cercar claus"
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr ""
-
 #: sm/gpgsm.c:328
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|usa l'algoritme de xifratge NOM"
@@ -7861,12 +7862,12 @@ msgstr "|NOM|usa l'algoritme de xifratge NOM"
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|usa l'algoritme de resum de missatges NOM"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7877,61 +7878,61 @@ msgstr ""
 "signa, comprova, xifra o desxifra\n"
 "l'operació predeterminada depén de les dades introduïdes\n"
 
-#: sm/gpgsm.c:629
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "no s'ha pogut connectar amb «%s»: %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(No es va donar una descripció)\n"
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " o = omet aquesta clau\n"
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
 # No em passe! ;)  ivb
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8211,8 +8212,8 @@ msgstr ""
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
@@ -8599,6 +8600,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "read options from file"
+#~ msgstr "s'estan llegint opcions de «%s»\n"
+
 #, fuzzy
 #~ msgid "|[FILE]|make a signature"
 #~ msgstr "|[fitxer]|crea una signatura"
diff --git a/po/cs.po b/po/cs.po
index 6349212d8..1533a7707 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.3.92\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2004-11-26 09:12+0200\n"
 "Last-Translator: Roman Pavlik <rp@tns.cz>\n"
 "Language-Team: Czech <translations.cs@gnupg.cz>\n"
@@ -94,7 +94,7 @@ msgstr "
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ochrann� algoritmus %d nen� podporov�n\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -104,12 +104,12 @@ msgstr "nemohu vytvo
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
@@ -322,12 +322,13 @@ msgstr ""
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr ""
 
@@ -335,7 +336,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "vyhledat kl��e na serveru kl���"
@@ -391,8 +392,8 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
@@ -400,158 +401,158 @@ msgstr ""
 "Chyby oznamte, pros�m, na adresu <gnupg-bugs@gnu.org>.\n"
 "P�ipom�nky k p�ekladu <rp@tns.cz>.\n"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: agent/gpg-agent.c:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, 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:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "chyba p�i vytv��en� `%s': %s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nemohu vytvo�it adres�� `%s': %s\n"
 
-#: agent/gpg-agent.c:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "chyba p�i z�sk�n� nov�ho PINu: %s\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, 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:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "adres�� `%s' vytvo�en\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) selhal v %s: %s\n"
 
-#: agent/gpg-agent.c:1513
+#: agent/gpg-agent.c:1538
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "nemohu vytvo�it adres�� `%s': %s\n"
 
-#: agent/gpg-agent.c:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1670
+#: agent/gpg-agent.c:1695
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1690
+#: agent/gpg-agent.c:1715
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1695
+#: agent/gpg-agent.c:1720
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
 
-#: agent/gpg-agent.c:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: p�esko�eno: %s\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: agent/gpg-agent.c:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "�patn� form�t prom�nn� prost�ed� GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -694,12 +695,12 @@ msgid ""
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 #, fuzzy
 msgid "Yes"
 msgstr "ano"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr ""
 
@@ -881,128 +882,128 @@ msgstr ""
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
-#: common/audit.c:684
+#: common/audit.c:692
 #, fuzzy
 msgid "Certificate chain available"
 msgstr "�patn� certifik�t"
 
-#: common/audit.c:691
+#: common/audit.c:699
 #, fuzzy
 msgid "root certificate missing"
 msgstr "�patn� certifik�t"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr ""
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 #, fuzzy
 msgid "Data available"
 msgstr "vypi� v�echna dostupn� data"
 
-#: common/audit.c:725
+#: common/audit.c:733
 #, fuzzy
 msgid "Session key created"
 msgstr "%s: soubor kl��� (keyring) vytvo�en\n"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, fuzzy, c-format
 msgid "algorithm: %s"
 msgstr "platnost: %s"
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: common/audit.c:736
+#: common/audit.c:744
 #, fuzzy
 msgid "seems to be not encrypted"
 msgstr "neza�ifrov�no"
 
-#: common/audit.c:742
+#: common/audit.c:750
 #, fuzzy
 msgid "Number of recipients"
 msgstr "Aktu�ln� p��jemci:\n"
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr ""
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr ""
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr ""
 
-#: common/audit.c:823
+#: common/audit.c:831
 #, fuzzy
 msgid "Data verification succeeded"
 msgstr "verifikace podpisu potla�ena\n"
 
-#: common/audit.c:832
+#: common/audit.c:840
 #, fuzzy
 msgid "Signature available"
 msgstr "Podpis vytvo�en %s\n"
 
-#: common/audit.c:837
+#: common/audit.c:845
 #, fuzzy
 msgid "Parsing signature succeeded"
 msgstr "Dobr� podpis od \"%s\""
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, fuzzy, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, fuzzy, c-format
 msgid "Signature %d"
 msgstr "Podpis vytvo�en %s\n"
 
-#: common/audit.c:873
+#: common/audit.c:881
 #, fuzzy
 msgid "Certificate chain valid"
 msgstr "Platnost kl��e vypr�ela!"
 
-#: common/audit.c:884
+#: common/audit.c:892
 #, fuzzy
 msgid "Root certificate trustworthy"
 msgstr "�patn� certifik�t"
 
-#: common/audit.c:894
+#: common/audit.c:902
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "�patn� certifik�t"
 
-#: common/audit.c:911
+#: common/audit.c:919
 #, fuzzy
 msgid "Included certificates"
 msgstr "�patn� certifik�t"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 #, fuzzy
 msgid "Unknown operation"
 msgstr "nezn�m� verze"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, fuzzy, c-format
 msgid "No help available for `%s'."
 msgstr "Pomoc nen� dostupn� pro '%s'"
@@ -1427,7 +1428,7 @@ msgstr "Neplatn
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento p��kaz nen� platn�\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nelze otev��t `%s'\n"
@@ -1952,17 +1953,17 @@ msgstr ""
 " --list-keys [jm�na]        vypsat kl��e\n"
 " --fingerprint [jm�na]      vypsat fingerprinty \n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Chyby oznamte, pros�m, na adresu <gnupg-bugs@gnu.org>.\n"
 "P�ipom�nky k p�ekladu <rp@tns.cz>.\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1972,7 +1973,7 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1980,83 +1981,79 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr "Ve�ejn� kl��: "
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr "�ifra: "
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 msgid "Compression: "
 msgstr "Komprese: "
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr ""
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "konfliktn� p��kazy\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, 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:1345
+#: g10/gpg.c:1324
 #, 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:1348
+#: g10/gpg.c:1327
 #, 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:1351
+#: g10/gpg.c:1330
 #, 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:1357
+#: g10/gpg.c:1336
 #, 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:1360
+#: g10/gpg.c:1339
 #, 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:1363
+#: g10/gpg.c:1342
 #, 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:1369
+#: g10/gpg.c:1348
 #, 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:1372
+#: g10/gpg.c:1351
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2064,21 +2061,21 @@ msgstr ""
 "VAROV�N�: vlastnictv� adres��e s konfigura�n�m souborem nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1354
 #, 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:1381
+#: g10/gpg.c:1360
 #, 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:1384
+#: g10/gpg.c:1363
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2086,7 +2083,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:1387
+#: g10/gpg.c:1366
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
@@ -2094,463 +2091,463 @@ msgstr ""
 "nastavena bezpe�n� `%s'\n"
 
 # c-format
-#: g10/gpg.c:1566
+#: g10/gpg.c:1545
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 #, 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:1688
+#: g10/gpg.c:1667
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, 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:1940
+#: g10/gpg.c:1919
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, 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:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2599
+#: g10/gpg.c:2578
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nen� platn� znakov� sada\n"
 
-#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru kl���\n"
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2613
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2616
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 msgid "invalid import options\n"
 msgstr "neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 msgid "invalid export options\n"
 msgstr "neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 msgid "invalid list options\n"
 msgstr "neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2670
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2672
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 msgid "invalid verify options\n"
 msgstr "neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2868
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s p�ep��e %s\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nen� dovoleno pou��vat %s s %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�v� s %s smysl!\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, 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:3044
+#: g10/gpg.c:3023
 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:3050
+#: g10/gpg.c:3029
 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:3056
+#: g10/gpg.c:3035
 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:3069
+#: g10/gpg.c:3048
 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:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� komprimovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 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:3170
+#: g10/gpg.c:3149
 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:3172
+#: g10/gpg.c:3151
 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:3174
+#: g10/gpg.c:3153
 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:3176
+#: g10/gpg.c:3155
 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:3179
+#: g10/gpg.c:3158
 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:3183
+#: g10/gpg.c:3162
 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:3190
+#: g10/gpg.c:3169
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� p�edvolby\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro �ifrov�n�\n"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro hashov�n�\n"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro komprimaci\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud nen� funk�n� s %s\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, 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:3292
+#: g10/gpg.c:3271
 #, 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:3297
+#: g10/gpg.c:3276
 #, 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:3380
+#: g10/gpg.c:3359
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 
-#: g10/gpg.c:3391
+#: g10/gpg.c:3370
 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:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [jm�no souboru]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symetrick� �ifrov�n� `%s' se nepovedlo: %s\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 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:3449
+#: g10/gpg.c:3428
 #, 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:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [jm�no souboru]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 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:3500
+#: g10/gpg.c:3479
 #, 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:3520
+#: g10/gpg.c:3499
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jm�no souboru]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jm�no souboru]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key id u�ivatele"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u�ivatele"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u�ivatele [p��kazy]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3683
+#: g10/gpg.c:3662
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export kl��e se nepoda�il: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hled�n� na keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh dat na keyserveru se nezda�il: %s\n"
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[jm�no souboru]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�n�te ps�t svou zpr�vu ...\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pro certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4267
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
 
-#: g10/gpg.c:4321
+#: g10/gpg.c:4300
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
@@ -2567,11 +2564,11 @@ msgstr "pouze varov
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapsat informace o stavu do tohoto FD"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6769,57 +6766,65 @@ msgstr "|N|Nov
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
 #, fuzzy
-msgid "read options from file"
+msgid "|FILE|write a log to FILE"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "zobraz administr�torsk� p��kazy"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7508,10 +7513,6 @@ msgstr ""
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr ""
-
 #: sm/gpgsm.c:328
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
@@ -7522,12 +7523,12 @@ msgstr "nezn
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7538,60 +7539,60 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: sm/gpgsm.c:629
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "nemohu se p�ipojit k `%s': %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "nezn�m� volba `%s'\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Nebyl zad�n ��dn� popis)\n"
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = p�esko�it tento kl��\n"
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "nelze zpracovat URL serveru kl���\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7869,8 +7870,8 @@ msgstr ""
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
@@ -8258,6 +8259,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "read options from file"
+#~ msgstr "�tu mo�nosti z `%s'\n"
+
 #~ msgid "generate PGP 2.x compatible messages"
 #~ msgstr "generovat zpr�vu komplatibiln� s PGP 2.x"
 
diff --git a/po/da.po b/po/da.po
index bc248036b..c074037e8 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2003-12-03 16:11+0100\n"
 "Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -92,7 +92,7 @@ msgstr "d
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -102,12 +102,12 @@ msgstr "kan ikke oprette %s: %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
@@ -322,12 +322,13 @@ msgstr ""
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr ""
 
@@ -335,7 +336,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "eksport�r n�gler til en n�gletjener"
@@ -391,163 +392,163 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Rapport�r venligst fejl til <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: agent/gpg-agent.c:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, fuzzy, c-format
 msgid "error creating `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: agent/gpg-agent.c:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "certifikatl�seproblem: %s\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/gpg-agent.c:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: mappe oprettet\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: agent/gpg-agent.c:1513
+#: agent/gpg-agent.c:1538
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: agent/gpg-agent.c:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1670
+#: agent/gpg-agent.c:1695
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1690
+#: agent/gpg-agent.c:1715
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1695
+#: agent/gpg-agent.c:1720
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: udelod: %s\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -686,12 +687,12 @@ msgid ""
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 #, fuzzy
 msgid "Yes"
 msgstr "ja"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr ""
 
@@ -871,125 +872,125 @@ msgstr ""
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
-#: common/audit.c:684
+#: common/audit.c:692
 #, fuzzy
 msgid "Certificate chain available"
 msgstr "certifikatl�seproblem: %s\n"
 
-#: common/audit.c:691
+#: common/audit.c:699
 #, fuzzy
 msgid "root certificate missing"
 msgstr "Godt certifikat"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr ""
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 #, fuzzy
 msgid "Data available"
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: common/audit.c:725
+#: common/audit.c:733
 msgid "Session key created"
 msgstr ""
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, fuzzy, c-format
 msgid "algorithm: %s"
 msgstr "panser: %s\n"
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
 "\n"
 "Underst�ttede algoritmer:\n"
 
-#: common/audit.c:736
+#: common/audit.c:744
 #, fuzzy
 msgid "seems to be not encrypted"
 msgstr "ikke krypteret"
 
-#: common/audit.c:742
+#: common/audit.c:750
 msgid "Number of recipients"
 msgstr ""
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr ""
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr ""
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr ""
 
-#: common/audit.c:823
+#: common/audit.c:831
 msgid "Data verification succeeded"
 msgstr ""
 
-#: common/audit.c:832
+#: common/audit.c:840
 #, fuzzy
 msgid "Signature available"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: common/audit.c:837
+#: common/audit.c:845
 #, fuzzy
 msgid "Parsing signature succeeded"
 msgstr "God signatur fra \""
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, fuzzy, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, fuzzy, c-format
 msgid "Signature %d"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: common/audit.c:873
+#: common/audit.c:881
 #, fuzzy
 msgid "Certificate chain valid"
 msgstr "certifikatl�seproblem: %s\n"
 
-#: common/audit.c:884
+#: common/audit.c:892
 #, fuzzy
 msgid "Root certificate trustworthy"
 msgstr "Godt certifikat"
 
-#: common/audit.c:894
+#: common/audit.c:902
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "Godt certifikat"
 
-#: common/audit.c:911
+#: common/audit.c:919
 #, fuzzy
 msgid "Included certificates"
 msgstr "Godt certifikat"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 #, fuzzy
 msgid "Unknown operation"
 msgstr "ukendt version"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, fuzzy, c-format
 msgid "No help available for `%s'."
 msgstr "Ingen hj�lp tilg�ngelig for `%s'"
@@ -1440,7 +1441,7 @@ msgstr ""
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
@@ -1958,16 +1959,16 @@ msgstr ""
 " --list-keys [navne]        vis n�gler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Rapport�r venligst fejl til <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
 # Skal alt dette overs�ttes eller er det flagene?
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1977,7 +1978,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1985,570 +1986,566 @@ msgstr ""
 "\n"
 "Underst�ttede algoritmer:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 #, fuzzy
 msgid "Compression: "
 msgstr "Kommentar: "
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr ""
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1345
+#: g10/gpg.c:1324
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1348
+#: g10/gpg.c:1327
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1351
+#: g10/gpg.c:1330
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1357
+#: g10/gpg.c:1336
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1360
+#: g10/gpg.c:1339
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1363
+#: g10/gpg.c:1342
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1369
+#: g10/gpg.c:1348
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1351
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1354
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1360
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1363
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1366
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1566
+#: g10/gpg.c:1545
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/gpg.c:1688
+#: g10/gpg.c:1667
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/gpg.c:1940
+#: g10/gpg.c:1919
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/gpg.c:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2599
+#: g10/gpg.c:2578
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2613
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2616
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2670
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2672
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2683
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2868
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3023
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3029
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3056
+#: g10/gpg.c:3035
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:3069
+#: g10/gpg.c:3048
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3170
+#: g10/gpg.c:3149
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3151
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3174
+#: g10/gpg.c:3153
 #, 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:3176
+#: g10/gpg.c:3155
 #, 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:3179
+#: g10/gpg.c:3158
 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:3183
+#: g10/gpg.c:3162
 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:3190
+#: g10/gpg.c:3169
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3271
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3276
 #, 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:3380
+#: g10/gpg.c:3359
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/gpg.c:3391
+#: g10/gpg.c:3370
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3428
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3500
+#: g10/gpg.c:3479
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3499
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3683
+#: g10/gpg.c:3662
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4267
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4321
+#: g10/gpg.c:4300
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
@@ -2567,12 +2564,12 @@ msgstr "tidsstempelkonflikt"
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinfo til denne FD"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6750,60 +6747,68 @@ msgstr "Indtast bruger-id: "
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111
-#, fuzzy
-msgid "read options from file"
-msgstr "l�ser indstillinger fra `%s'\n"
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
+#, fuzzy
+msgid "|FILE|write a log to FILE"
+msgstr "|FILE|indl�s udvidelsesmodul FILE"
+
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "brug overhovedet ikke terminalen"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "konfliktende kommandoer\n"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7488,10 +7493,6 @@ msgstr "|NAME|brug NAME som standard hemmelign
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|brug denne n�gletjener til at sl� n�gler op"
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr ""
-
 #: sm/gpgsm.c:328
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|brug cifferalgoritme NAME"
@@ -7500,13 +7501,13 @@ msgstr "|NAME|brug cifferalgoritme NAME"
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|brug meddelelsesresum� algoritme NAME"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
 # Skal alt dette overs�ttes eller er det flagene?
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7517,60 +7518,60 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: sm/gpgsm.c:629
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "brug: gpg [flag] "
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr ""
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s: udelod: %s\n"
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7851,8 +7852,8 @@ msgstr ""
 msgid "Options useful for debugging"
 msgstr "sl� fuld fejltjekning til"
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
@@ -8237,6 +8238,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "read options from file"
+#~ msgstr "l�ser indstillinger fra `%s'\n"
+
 #~ msgid "|[file]|make a signature"
 #~ msgstr "|[filer]|opret en signatur"
 
diff --git a/po/de.po b/po/de.po
index d41931e54..0dabcbe15 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.0.6\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
-"PO-Revision-Date: 2008-11-13 12:50+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
+"PO-Revision-Date: 2008-12-04 18:33+0100\n"
 "Last-Translator: Walter Koch <koch@u32.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -96,7 +96,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:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -106,12 +106,12 @@ msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
@@ -331,11 +331,12 @@ msgstr "Ausgabe für /bin/sh"
 msgid "csh-style command output"
 msgstr "Ausgabe für /bin/csh"
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr "Im Vordergrund laufen lassen"
 
@@ -343,7 +344,7 @@ msgstr "Im Vordergrund laufen lassen"
 msgid "do not grab keyboard and mouse"
 msgstr "Tastatur und Maus nicht \"grabben\""
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "Logausgaben in eine Datei umlenken"
 
@@ -395,17 +396,17 @@ msgstr "Die ssh-agent-Emulation anschalten"
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|DATEI|Schreibe die Umgebungsvariabeln auf DATEI"
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "Fehlerberichte bitte an <"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Aufruf: gpg-agent [Optionen] (-h für Hilfe)"
 
-#: agent/gpg-agent.c:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -413,144 +414,144 @@ msgstr ""
 "Syntax: gpg-agent [Optionen] [Befehl [Argumente]]\n"
 "Verwaltung von geheimen Schlüsseln für GnuPG\n"
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ungültige Debugebene `%s' angegeben\n"
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "Die Bibliothek %s ist nicht aktuell (benötige %s, habe %s)\n"
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Fehler beim Erstellen von `%s': %s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "Verzeichnis `%s' kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr "Der Name des Sockets ist zu lang\n"
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "Socket kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "Der Name des Sockets `%s' ist zu lang\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "Ein gpg-agent läuft bereits - ein weiterer wird nicht gestartet\n"
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 msgid "error getting nonce for the socket\n"
 msgstr "Fehler beim Ermitteln der \"Nonce\" dieses Sockets\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, 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:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "Der listen()-Aufruf ist fehlgeschlagen: %s\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "Es wird auf Socket `%s' gehört\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "Verzeichnis `%s' erzeugt\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat()-Aufruf für `%s' fehlgeschlagen: %s\n"
 
-#: agent/gpg-agent.c:1513
+#: agent/gpg-agent.c:1538
 #, 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:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "Fehler beim Lesen der \"Nonce\" von FD %d: %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, 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:1670
+#: agent/gpg-agent.c:1695
 #, 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:1690
+#: agent/gpg-agent.c:1715
 #, 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:1695
+#: agent/gpg-agent.c:1720
 #, 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:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
 
-#: agent/gpg-agent.c:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s angehalten\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 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:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
 
-#: agent/gpg-agent.c:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -698,15 +699,13 @@ msgstr "Korrekt"
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
-msgstr ""
-"Wenn Sie vollständiges Vertrauen haben, daß%%0A  \"%s\"%%"
-"0ABenutzerzertifikate verläßlich zertifiziert, so antworten Sie mit \"Ja\""
+msgstr "Wenn Sie vollständiges Vertrauen haben, daß%%0A  \"%s\"%%0ABenutzerzertifikate verläßlich zertifiziert, so antworten Sie mit \"Ja\"."
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr "Nein"
 
@@ -888,112 +887,112 @@ msgstr "Kein aktiver gpg-agent - es wird einer gestarted\n"
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "Verbindung zum gpg-agent nicht möglich - Ersatzmethode wird versucht\n"
 
-#: common/audit.c:684
+#: common/audit.c:692
 msgid "Certificate chain available"
 msgstr "Zertifikatkette vorhanden"
 
-#: common/audit.c:691
+#: common/audit.c:699
 msgid "root certificate missing"
 msgstr "Das Wurzelzertifikat fehlt"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr "Verschlüsseln der Daten erfolgreich"
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 msgid "Data available"
 msgstr "Daten vorhanden"
 
-#: common/audit.c:725
+#: common/audit.c:733
 msgid "Session key created"
 msgstr "Sitzungsschlüssel erzeugt"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, c-format
 msgid "algorithm: %s"
 msgstr "Verfahren: %s"
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "Nicht unterstütztes Verfahren: %s"
 
-#: common/audit.c:736
+#: common/audit.c:744
 msgid "seems to be not encrypted"
 msgstr "dies is wahrscheinlich nicht verschlüsselt"
 
-#: common/audit.c:742
+#: common/audit.c:750
 msgid "Number of recipients"
 msgstr "Anzahl der Empfänger"
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr "Empfänger %d"
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr "Signieren der Daten erfolgreich"
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr "Entschlüsselung der Daten erfolgreich"
 
-#: common/audit.c:823
+#: common/audit.c:831
 msgid "Data verification succeeded"
 msgstr "Prüfung der Signatur erfolgreich"
 
-#: common/audit.c:832
+#: common/audit.c:840
 msgid "Signature available"
 msgstr "Signatur vorhanden"
 
-#: common/audit.c:837
+#: common/audit.c:845
 msgid "Parsing signature succeeded"
 msgstr "Syntaxanalyse der Signatur erfolgreich"
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "Ungültiges Hashverfahren: %s"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, c-format
 msgid "Signature %d"
 msgstr "Signatur %d"
 
-#: common/audit.c:873
+#: common/audit.c:881
 msgid "Certificate chain valid"
 msgstr "Zertifikatkette gültig"
 
-#: common/audit.c:884
+#: common/audit.c:892
 msgid "Root certificate trustworthy"
 msgstr "Wurzelzertifikat vertrauenswürdig"
 
-#: common/audit.c:894
+#: common/audit.c:902
 msgid "CRL/OCSP check of certificates"
 msgstr "CRL/OCSP Prüfung der Zertifikate"
 
-#: common/audit.c:911
+#: common/audit.c:919
 msgid "Included certificates"
 msgstr "Mitgesendete Zertifikate"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr "Keine Einträge in der Audit-Datei"
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 msgid "Unknown operation"
 msgstr "Unbekannte Operation"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent benutzbar"
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr "Dirmngr benutzbar"
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, c-format
 msgid "No help available for `%s'."
 msgstr "Keine Hilfe für '%s' vorhanden."
@@ -1416,7 +1415,7 @@ msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Befehl\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht geöffnet werden\n"
@@ -1943,17 +1942,17 @@ msgstr ""
 " --list-keys [Namen]        Schlüssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdrücke\" anzeigen\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Berichte über Programmfehler bitte in englisch an <gnupg-bugs@gnu.org>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <de@li.org>.\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h für Hilfe)"
 
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1963,7 +1962,7 @@ msgstr ""
 "Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
 "Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1971,77 +1970,73 @@ msgstr ""
 "\n"
 "Unterstützte Verfahren:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr "Öff. Schlüssel: "
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr "Verschlü.: "
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 msgid "Compression: "
 msgstr "Komprimierung: "
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr "Verwendete Bibliotheken:"
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Befehle\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
 
-#: g10/gpg.c:1345
+#: g10/gpg.c:1324
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1348
+#: g10/gpg.c:1327
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1351
+#: g10/gpg.c:1330
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1357
+#: g10/gpg.c:1336
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1360
+#: g10/gpg.c:1339
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1363
+#: g10/gpg.c:1342
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1369
+#: g10/gpg.c:1348
 #, 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:1372
+#: g10/gpg.c:1351
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2049,20 +2044,20 @@ msgstr ""
 "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses der "
 "Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1354
 #, 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:1381
+#: g10/gpg.c:1360
 #, 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:1384
+#: g10/gpg.c:1363
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2070,475 +2065,475 @@ msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
 "Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1366
 #, 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:1566
+#: g10/gpg.c:1545
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Unbekanntes Konfigurationselement `%s'\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr "Anzeigen der Foto-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr "Zeige Richtlinien-URL während der Unterschriftenlisten"
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 msgid "show all notations during signature listings"
 msgstr "Alle Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr "Zeige IETF-Standard"
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr "Zeige anwenderseitige Notationen in den Unterschriftenlisten"
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "Der bevorzugten Schlüsselserver mit den Signaturen anlisten"
 
-#: g10/gpg.c:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr "Zeige Gültigkeit der User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr "Zeige widerrufene und verfallene User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr "Zeige widerrufene und verfallene Unterschlüssel in den Schlüssellisten"
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 msgid "show the keyring name in key listings"
 msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
 
-#: g10/gpg.c:1688
+#: g10/gpg.c:1667
 msgid "show expiration dates during signature listings"
 msgstr "Das Ablaufdatum mit den Signaturen anlisten"
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
-#: g10/gpg.c:1940
+#: g10/gpg.c:1919
 #, 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:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, 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:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' ist kein gültiges Unterschriftablaufdatum\n"
 
-#: g10/gpg.c:2599
+#: g10/gpg.c:2578
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' ist kein gültiger Zeichensatz\n"
 
-#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 msgid "could not parse keyserver URL\n"
 msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2613
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2616
 msgid "invalid keyserver options\n"
 msgstr "Ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ungültige Import-Option\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 msgid "invalid import options\n"
 msgstr "Ungültige Import-Option\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ungültige Export-Option.\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 msgid "invalid export options\n"
 msgstr "Ungültige Export-Option\n"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ungültige Listen-Option.\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 msgid "invalid list options\n"
 msgstr "Ungültige Listen-Option\n"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr "Zeige die Foto-ID während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr "Zeige Richtlinien-URLs während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 msgid "show all notations during signature verification"
 msgstr "Alle Notationen wahrend der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr "Zeige IETF-Standard-Notationen während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr "Zeie anwenderseitige Notationen während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 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:2689
+#: g10/gpg.c:2668
 msgid "show user ID validity during signature verification"
 msgstr "Die Gültigkeit der User-ID während der Unterschriftenprüfung anzeigen"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2670
 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:2693
+#: g10/gpg.c:2672
 msgid "show only the primary user ID in signature verification"
 msgstr "Zeige nur die Hauptuser-ID während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr "Prüfe Unterschriftengültigkeit mittels PKA-Daten"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 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:2704
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ungültige Überprüfuns-Option.\n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 msgid "invalid verify options\n"
 msgstr "Ungültige Überprüfungs-Option\n"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, 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:2889
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr "ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, 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:3044
+#: g10/gpg.c:3023
 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:3050
+#: g10/gpg.c:3029
 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:3056
+#: g10/gpg.c:3035
 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:3069
+#: g10/gpg.c:3048
 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:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed müssen größer als 0 sein\n"
 
-#: g10/gpg.c:3170
+#: g10/gpg.c:3149
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed müssen größer als 1 sein\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3151
 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:3174
+#: g10/gpg.c:3153
 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:3176
+#: g10/gpg.c:3155
 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:3179
+#: g10/gpg.c:3158
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/gpg.c:3183
+#: g10/gpg.c:3162
 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:3190
+#: g10/gpg.c:3169
 msgid "invalid default preferences\n"
 msgstr "ungültige Standard-Voreinstellungen\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 msgid "invalid personal cipher preferences\n"
 msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 msgid "invalid personal digest preferences\n"
 msgstr "ungültige private Hashvoreinstellungen\n"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 msgid "invalid personal compress preferences\n"
 msgstr "ungültige private Komprimierungsvoreinstellungen\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, 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:3292
+#: g10/gpg.c:3271
 #, 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:3297
+#: g10/gpg.c:3276
 #, 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:3380
+#: g10/gpg.c:3359
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/gpg.c:3391
+#: g10/gpg.c:3370
 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:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [Dateiname]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 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:3449
+#: g10/gpg.c:3428
 #, 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:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 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:3500
+#: g10/gpg.c:3479
 #, 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:3520
+#: g10/gpg.c:3499
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3683
+#: g10/gpg.c:3662
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schlüsselexport fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4267
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4321
+#: g10/gpg.c:4300
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
 
@@ -2554,11 +2549,11 @@ msgstr "differierende Zeitangaben sind kein Fehler"
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h für Hilfe)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6828,39 +6823,47 @@ msgstr "|N|Erstmalige neue PIN"
 msgid "run in multi server mode (foreground)"
 msgstr "Im Multiserver Modus ausführen"
 
-#: scd/scdaemon.c:111
-msgid "read options from file"
-msgstr "Konfigurationsoptionen aus Datei lesen"
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr "|NAME|Die Debugstufe auf NAME setzen"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
+msgid "|FILE|write a log to FILE"
+msgstr "|DATEI|Schreibe Logs auf DATEI"
+
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr "|N|Verbinde mit dem Leser auf Port N"
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|Benutze NAME als CT-API Treiber"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|Benutze NAME als PC/SC Treiber"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 msgid "do not use the internal CCID driver"
 msgstr "Den internen CCID Treiber nicht benutzen"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr "|N|Schalte die Karte nach N Sekunden Inaktivität ab"
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr "Die Tastatur des Kartenleser nicht benutzen"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 msgid "allow the use of admin card commands"
 msgstr "Erlaube die Benutzung von \"Admin\"-Befehlen"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Aufruf: scdaemon [Optionen] (-h für Hilfe)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6868,18 +6871,18 @@ msgstr ""
 "Synatx: scdaemon [Optionen] [Befehl [Argumente]]\n"
 "Smartcard Daemon für GnuPG\n"
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 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:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "Handhabungsroutine für fd %d gestartet\n"
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "Handhabungsroutine für den fd %d beendet\n"
@@ -7548,10 +7551,6 @@ msgstr "|USER-ID|USER-ID als voreingestellten Schlüssel benutzen"
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|Schlüssel bei diesem Server nachschlagen"
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr "|NAME|Die Debugstufe auf NAME setzen"
-
 #: sm/gpgsm.c:328
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschlüsselungsverfahren NAME benutzen"
@@ -7560,11 +7559,11 @@ msgstr "|NAME|Verschlüsselungsverfahren NAME benutzen"
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Aufruf: gpgsm [Optionen] [Dateien] (-h für Hilfe)"
 
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7573,58 +7572,58 @@ msgstr ""
 "Syntax: gpgsm [Optionen] [Dateien]\n"
 "Signieren, prüfen, ver- und entschlüsseln mittels S/MIME protocol\n"
 
-#: sm/gpgsm.c:629
+#: sm/gpgsm.c:610
 msgid "usage: gpgsm [options] "
 msgstr "Aufruf: gpgsm [Optionen] "
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "Hinweis: Verschlüsselung für `%s' wird nicht möglich sein: %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "Unbekanntes Gültigkeitsmodell '%s'\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: Kein Server-Name angegeben\n"
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: Passwort ohne Benutzer\n"
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: Zeile wird übersprungen\n"
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 msgid "could not parse keyserver\n"
 msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "Importiere allgemeine Zertifikate: %s\n"
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "Signieren mit `%s' nicht möglich: %s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr "Dieser Befehl wurde noch nicht implementiert\n"
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr "Ungültiger Befehl (Es gibt keinen implizierten Befehl)\n"
 
@@ -7763,7 +7762,9 @@ msgstr ""
 #: sm/sign.c:420
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
-msgstr "Hashverfahren %d (%s) wird für Unterzeichner %d nicht unterstützt; %s wird benutzt\n"
+msgstr ""
+"Hashverfahren %d (%s) wird für Unterzeichner %d nicht unterstützt; %s wird "
+"benutzt\n"
 
 #: sm/sign.c:433
 #, c-format
@@ -7909,8 +7910,8 @@ msgstr "Optionen zur Einstellung der Konfiguration"
 msgid "Options useful for debugging"
 msgstr "Nützliche Optionen zur Fehlersuche"
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
 
@@ -8289,6 +8290,12 @@ msgstr ""
 "Syntax: gpg-check-pattern [optionen] Musterdatei\n"
 "Die von stdin gelesene Passphrase gegen die Musterdatei prüfen\n"
 
+#~ msgid "read options from file"
+#~ msgstr "Konfigurationsoptionen aus Datei lesen"
+
+#~ msgid "Used libraries:"
+#~ msgstr "Verwendete Bibliotheken:"
+
 #~ msgid "generate PGP 2.x compatible messages"
 #~ msgstr "PGP 2.x-kompatibele Botschaften erzeugen"
 
diff --git a/po/el.po b/po/el.po
index f5c8098a5..e1ff71fd2 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2003-06-27 12:00+0200\n"
 "Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -92,7 +92,7 @@ msgstr "
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -102,12 +102,12 @@ msgstr "
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
@@ -320,12 +320,13 @@ msgstr ""
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|������|������� ��� ���������� ��������� ������"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr ""
 
@@ -333,7 +334,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "��������� �������� �� ��� ���������� ��������"
@@ -390,165 +391,165 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "��������� �� ���������� ��� <gnupg-bugs@gnu.org>\n"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: agent/gpg-agent.c:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "������ ���� �� ���������� ��� `%s': %s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�������� ����������� ��������� `%s': %s\n"
 
-#: agent/gpg-agent.c:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "������ ��� �������� ���� �� `%s': %s\n"
 
-#: agent/gpg-agent.c:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: ��������� �������������\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1513
+#: agent/gpg-agent.c:1538
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: �������� ����������� ���������: %s\n"
 
-#: agent/gpg-agent.c:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1670
+#: agent/gpg-agent.c:1695
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1690
+#: agent/gpg-agent.c:1715
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1695
+#: agent/gpg-agent.c:1720
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: agent/gpg-agent.c:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ������������: %s\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: agent/gpg-agent.c:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "��������������� ��������� ������������� GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -691,12 +692,12 @@ msgid ""
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 #, fuzzy
 msgid "Yes"
 msgstr "���|���"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr ""
 
@@ -879,127 +880,127 @@ msgstr ""
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
-#: common/audit.c:684
+#: common/audit.c:692
 #, fuzzy
 msgid "Certificate chain available"
 msgstr "���� �������������"
 
-#: common/audit.c:691
+#: common/audit.c:699
 #, fuzzy
 msgid "root certificate missing"
 msgstr "���� �������������"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr ""
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 #, fuzzy
 msgid "Data available"
 msgstr "������ ��������� ���: "
 
-#: common/audit.c:725
+#: common/audit.c:733
 #, fuzzy
 msgid "Session key created"
 msgstr "%s: ���������� �������������\n"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, fuzzy, c-format
 msgid "algorithm: %s"
 msgstr "��������: %s\n"
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
 "\n"
 "��������������� ����������:\n"
 
-#: common/audit.c:736
+#: common/audit.c:744
 #, fuzzy
 msgid "seems to be not encrypted"
 msgstr "�� ���������������"
 
-#: common/audit.c:742
+#: common/audit.c:750
 msgid "Number of recipients"
 msgstr ""
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr ""
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr ""
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr ""
 
-#: common/audit.c:823
+#: common/audit.c:831
 #, fuzzy
 msgid "Data verification succeeded"
 msgstr "��������� ��������� ���������\n"
 
-#: common/audit.c:832
+#: common/audit.c:840
 #, fuzzy
 msgid "Signature available"
 msgstr "�������� ����� ���� %s.\n"
 
-#: common/audit.c:837
+#: common/audit.c:845
 #, fuzzy
 msgid "Parsing signature succeeded"
 msgstr "���� �������� ��� \""
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, fuzzy, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, fuzzy, c-format
 msgid "Signature %d"
 msgstr "�������� ����� ���� %s.\n"
 
-#: common/audit.c:873
+#: common/audit.c:881
 #, fuzzy
 msgid "Certificate chain valid"
 msgstr "���� �� ������ ���� �����!"
 
-#: common/audit.c:884
+#: common/audit.c:892
 #, fuzzy
 msgid "Root certificate trustworthy"
 msgstr "���� �������������"
 
-#: common/audit.c:894
+#: common/audit.c:902
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "���� �������������"
 
-#: common/audit.c:911
+#: common/audit.c:919
 #, fuzzy
 msgid "Included certificates"
 msgstr "���� �������������"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 #, fuzzy
 msgid "Unknown operation"
 msgstr "������� ������"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, fuzzy, c-format
 msgid "No help available for `%s'."
 msgstr "��� ������� ��������� ������� ��� `%s'"
@@ -1453,7 +1454,7 @@ msgstr "
 msgid "--output doesn't work for this command\n"
 msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "�������� ��������� ��� `%s'\n"
@@ -1994,15 +1995,15 @@ msgstr ""
 " --list-keys [�������]        ���������� ��������\n"
 " --fingerprint [�������]      ���������� ������������ (fingerprints)\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "��������� �� ���������� ��� <gnupg-bugs@gnu.org>\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2012,7 +2013,7 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2020,572 +2021,568 @@ msgstr ""
 "\n"
 "��������������� ����������:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr "�����������:"
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr "���������������: "
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 msgid "Compression: "
 msgstr "��������: "
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr ""
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "�����: gpg [��������] "
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "������������� �������\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
 
-#: g10/gpg.c:1345
+#: g10/gpg.c:1324
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1348
+#: g10/gpg.c:1327
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1351
+#: g10/gpg.c:1330
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1357
+#: g10/gpg.c:1336
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1360
+#: g10/gpg.c:1339
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1363
+#: g10/gpg.c:1342
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1369
+#: g10/gpg.c:1348
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1351
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1354
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1360
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1363
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1366
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1566
+#: g10/gpg.c:1545
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
 
-#: g10/gpg.c:1688
+#: g10/gpg.c:1667
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
 
-#: g10/gpg.c:1940
+#: g10/gpg.c:1919
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
 
-#: g10/gpg.c:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2599
+#: g10/gpg.c:2578
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2613
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2616
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 msgid "invalid import options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 msgid "invalid export options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2670
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2672
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2683
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�������� ������� ��� exec-path �� %s\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2868
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�������������: �� %s ����������� �� %s\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3023
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3029
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
 "���������\n"
 
-#: g10/gpg.c:3056
+#: g10/gpg.c:3035
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
 
-#: g10/gpg.c:3069
+#: g10/gpg.c:3048
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "� ����������� ���������� ��������� ��� �����������\n"
 "��� ����� �������\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/gpg.c:3170
+#: g10/gpg.c:3149
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3151
 #, 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:3174
+#: g10/gpg.c:3153
 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:3176
+#: g10/gpg.c:3155
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3158
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/gpg.c:3183
+#: g10/gpg.c:3162
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/gpg.c:3190
+#: g10/gpg.c:3169
 msgid "invalid default preferences\n"
 msgstr "�� ������� �����������\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 msgid "invalid personal cipher preferences\n"
 msgstr "�� ������� ����������� ���������� ���������������\n"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 msgid "invalid personal digest preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 msgid "invalid personal compress preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3271
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3276
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3359
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/gpg.c:3391
+#: g10/gpg.c:3370
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3428
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3500
+#: g10/gpg.c:3479
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3499
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/gpg.c:3683
+#: g10/gpg.c:3662
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "������� �������� �������: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver ��������� �������: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4267
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4321
+#: g10/gpg.c:4300
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
@@ -2603,11 +2600,11 @@ msgstr "
 msgid "|FD|write status info to this FD"
 msgstr "|FD|������� ��� ����������� ���������� ��� FD"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "�����: gpgv [��������] [������] (-h ��� �������)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6943,60 +6940,68 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111
-#, fuzzy
-msgid "read options from file"
-msgstr "�������� �������� ��� `%s'\n"
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
+#, fuzzy
+msgid "|FILE|write a log to FILE"
+msgstr "|������|������� ��� ���������� ��������� ������"
+
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|�����|����� ��� �������� �� ��������������� ���������"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|�����|����� ��� �������� �� ��������������� ���������"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "�� ����� ����������"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "������������� �������\n"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7686,10 +7691,6 @@ msgstr "|
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|�����������|����� ����� ��� ���������� �������� ��� ���������"
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr ""
-
 #: sm/gpgsm.c:328
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|�����|����� ���������� �������������� �����"
@@ -7698,12 +7699,12 @@ msgstr "|
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|�����|����� ���������� ��������� ��������� ����� "
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7714,60 +7715,60 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: sm/gpgsm.c:629
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "�����: gpg [��������] "
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(��� ������ ���������)\n"
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = ��������� ����� ��� ��������\n"
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "������� ���  `%s'\n"
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8047,8 +8048,8 @@ msgstr ""
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
@@ -8435,6 +8436,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "read options from file"
+#~ msgstr "�������� �������� ��� `%s'\n"
+
 #~ msgid "|[file]|make a signature"
 #~ msgstr "|[������]|���������� ���� ���������"
 
diff --git a/po/eo.po b/po/eo.po
index 5a647a011..b6b141d90 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -92,7 +92,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:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -102,12 +102,12 @@ msgstr "ne povas krei '%s': %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
@@ -321,12 +321,13 @@ msgstr ""
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr ""
 
@@ -334,7 +335,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "ser�i �losilojn �e �losilservilo"
@@ -390,165 +391,165 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Bonvolu raporti cimojn al <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: agent/gpg-agent.c:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "Valida atestilrevoko"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: agent/gpg-agent.c:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: dosierujo kreita\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1513
+#: agent/gpg-agent.c:1538
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1670
+#: agent/gpg-agent.c:1695
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1690
+#: agent/gpg-agent.c:1715
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1695
+#: agent/gpg-agent.c:1720
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu �losiloj ignoritaj\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 #, 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:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -691,12 +692,12 @@ msgid ""
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 #, fuzzy
 msgid "Yes"
 msgstr "jes"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr ""
 
@@ -880,131 +881,131 @@ msgstr ""
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
-#: common/audit.c:684
+#: common/audit.c:692
 #, fuzzy
 msgid "Certificate chain available"
 msgstr "Valida atestilrevoko"
 
-#: common/audit.c:691
+#: common/audit.c:699
 #, fuzzy
 msgid "root certificate missing"
 msgstr ""
 "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
 "\n"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr ""
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 #, fuzzy
 msgid "Data available"
 msgstr "Nenia helpo disponata"
 
-#: common/audit.c:725
+#: common/audit.c:733
 #, fuzzy
 msgid "Session key created"
 msgstr "%s: �losilaro kreita\n"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, fuzzy, c-format
 msgid "algorithm: %s"
 msgstr "kiraso: %s\n"
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: common/audit.c:736
+#: common/audit.c:744
 #, fuzzy
 msgid "seems to be not encrypted"
 msgstr "ne �ifrita"
 
-#: common/audit.c:742
+#: common/audit.c:750
 msgid "Number of recipients"
 msgstr ""
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr ""
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr ""
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr ""
 
-#: common/audit.c:823
+#: common/audit.c:831
 #, fuzzy
 msgid "Data verification succeeded"
 msgstr "kontrolo de subskribo estas mal�altita\n"
 
-#: common/audit.c:832
+#: common/audit.c:840
 #, fuzzy
 msgid "Signature available"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: common/audit.c:837
+#: common/audit.c:845
 #, fuzzy
 msgid "Parsing signature succeeded"
 msgstr "Bona subskribo de \""
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, fuzzy, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, fuzzy, c-format
 msgid "Signature %d"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: common/audit.c:873
+#: common/audit.c:881
 #, fuzzy
 msgid "Certificate chain valid"
 msgstr "Valida atestilrevoko"
 
-#: common/audit.c:884
+#: common/audit.c:892
 #, fuzzy
 msgid "Root certificate trustworthy"
 msgstr ""
 "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
 "\n"
 
-#: common/audit.c:894
+#: common/audit.c:902
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "Bona atestilo"
 
-#: common/audit.c:911
+#: common/audit.c:919
 #, fuzzy
 msgid "Included certificates"
 msgstr "Nevalida atestilo"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 #, fuzzy
 msgid "Unknown operation"
 msgstr "nekonata versio"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, fuzzy, c-format
 msgid "No help available for `%s'."
 msgstr "Nenia helpo disponata por '%s'"
@@ -1460,7 +1461,7 @@ msgstr "Nevalida komando (provu per \"helpo\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por �i tiu komando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
@@ -1982,15 +1983,15 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Bonvolu raporti cimojn al <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2000,7 +2001,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2008,569 +2009,565 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr ""
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1345
+#: g10/gpg.c:1324
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1348
+#: g10/gpg.c:1327
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1351
+#: g10/gpg.c:1330
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1357
+#: g10/gpg.c:1336
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1360
+#: g10/gpg.c:1339
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1363
+#: g10/gpg.c:1342
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1369
+#: g10/gpg.c:1348
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1351
 #, 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:1375
+#: g10/gpg.c:1354
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1360
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1363
 #, 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:1387
+#: g10/gpg.c:1366
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1566
+#: g10/gpg.c:1545
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "montri, en kiu �losilaro estas listigita �losilo"
 
-#: g10/gpg.c:1688
+#: g10/gpg.c:1667
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/gpg.c:1940
+#: g10/gpg.c:1919
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/gpg.c:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2599
+#: g10/gpg.c:2578
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2613
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2616
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2670
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2672
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2683
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2868
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3023
 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:3050
+#: g10/gpg.c:3029
 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:3056
+#: g10/gpg.c:3035
 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:3069
+#: g10/gpg.c:3048
 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:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/gpg.c:3170
+#: g10/gpg.c:3149
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3151
 #, 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:3174
+#: g10/gpg.c:3153
 #, 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:3176
+#: g10/gpg.c:3155
 #, 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:3179
+#: g10/gpg.c:3158
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/gpg.c:3183
+#: g10/gpg.c:3162
 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:3190
+#: g10/gpg.c:3169
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, 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:3292
+#: g10/gpg.c:3271
 #, 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:3297
+#: g10/gpg.c:3276
 #, 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:3380
+#: g10/gpg.c:3359
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/gpg.c:3391
+#: g10/gpg.c:3370
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3428
 #, 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:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3500
+#: g10/gpg.c:3479
 #, 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:3520
+#: g10/gpg.c:3499
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3683
+#: g10/gpg.c:3662
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4267
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:4321
+#: g10/gpg.c:4300
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@ -2589,12 +2586,12 @@ msgstr "malkongruo de tempostampoj"
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6897,60 +6894,68 @@ msgstr "Donu la uzantidentigilon: "
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111
-#, fuzzy
-msgid "read options from file"
-msgstr "legas opciojn el '%s'\n"
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
+#, fuzzy
+msgid "|FILE|write a log to FILE"
+msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
+
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "tute ne uzi la terminalon"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "malkongruaj komandoj\n"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7653,10 +7658,6 @@ msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan 
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SERVILO|uzi �i tiun �losilservilon por ser�i �losilojn"
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr ""
-
 #: sm/gpgsm.c:328
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO"
@@ -7665,12 +7666,12 @@ msgstr "|NOMO|uzi 
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMO|uzi kompendi-metodon NOMO"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7681,60 +7682,60 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: sm/gpgsm.c:629
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr ""
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = supersalti �i tiun �losilon\n"
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8012,8 +8013,8 @@ msgstr ""
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
@@ -8399,6 +8400,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "read options from file"
+#~ msgstr "legas opciojn el '%s'\n"
+
 #~ msgid "|[file]|make a signature"
 #~ msgstr "|[dosiero]|fari subskribon"
 
diff --git a/po/es.po b/po/es.po
index 2ff5a5e92..fe77cfcf3 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0.9\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2008-05-27 22:38+0100\n"
 "Last-Translator: Jaime Su�rez <jaime@mundocripto.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -111,7 +111,7 @@ msgstr "Frase contrase
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "no pueden usarse claves ssh de m�s de %d bits\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -121,12 +121,12 @@ msgstr "no se puede crear %s: %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
@@ -347,11 +347,12 @@ msgstr "salida de datos estilo sh"
 msgid "csh-style command output"
 msgstr "salida de datos estilo csh"
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|FICHERO|lee opciones desde FICHERO"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr "no independizarse de la consola"
 
@@ -359,7 +360,7 @@ msgstr "no independizarse de la consola"
 msgid "do not grab keyboard and mouse"
 msgstr "no acaparar teclado y rat�n"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "usar un fichero log para el servidor"
 
@@ -411,17 +412,17 @@ msgstr "permitir emulaci
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FICHERO|escribir variables de entorno tambi�n en FICHERO"
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "Por favor, informe de posibles \"bugs\" a <"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg-agent [opciones] (-h para ayuda)"
 
-#: agent/gpg-agent.c:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -429,145 +430,145 @@ msgstr ""
 "Sintaxis: gpg-agent [opciones] [orden [argumentos]]\n"
 "Manejo de claves privadas por GnuPG\n"
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "el nivel de depuraci�n `%s` no es v�lido\n"
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s es demasiado antiguo (necesita %s, tiene %s)\n"
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, 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:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error creando `%s': %s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no se puede crear el directorio `%s': %s\n"
 
-#: agent/gpg-agent.c:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr "nombre de socket demasiado largo\n"
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "no se puede crear el socket: %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "el nombre de socket `%s' es demasiado largo\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "ya hay un agente gpg ejecut�ndose - no se inicia otro\n"
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 msgid "error getting nonce for the socket\n"
 msgstr "error obteniendo valor �nico para el socket\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "error enlazando el socket con `%s': %s\n"
 
-#: agent/gpg-agent.c:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() fall�: %s\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "escuchando el socket `%s'\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "directorio `%s' creado\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() fall� para `%s': %s\n"
 
-#: agent/gpg-agent.c:1513
+#: agent/gpg-agent.c:1538
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "no puede usar `%s' como directorio personal\n"
 
-#: agent/gpg-agent.c:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "error leyendo valor �nico en el descriptor %d: %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "manejador 0x%lx para descriptor %d iniciado\n"
 
-#: agent/gpg-agent.c:1670
+#: agent/gpg-agent.c:1695
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "manejador 0x%lx pada descriptor %d finalizado\n"
 
-#: agent/gpg-agent.c:1690
+#: agent/gpg-agent.c:1715
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "manejador ssh 0x%lx para el descriptor %d iniciado\n"
 
-#: agent/gpg-agent.c:1695
+#: agent/gpg-agent.c:1720
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "manejador ssh 0x%lx para el descriptor %d finalizado\n"
 
-#: agent/gpg-agent.c:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select fall�: %s - espero 1s\n"
 
 # msgstr "clave %08lX: %d nuevas subclaves\n"
-#: agent/gpg-agent.c:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s detenido\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 msgid "no gpg-agent running in this session\n"
 msgstr "no hay un agente gpg ejecut�ndose en esta sesi�n\n"
 
-#: agent/gpg-agent.c:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
 
-#: agent/gpg-agent.c:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -723,11 +724,11 @@ msgstr ""
 "�Conf�a absolutamente en%%0A  \"%s\"%%0A para certificar correctamentelos "
 "certificados de otros usuarios?"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 msgid "Yes"
 msgstr "S�"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr "No"
 
@@ -907,112 +908,112 @@ msgstr "no hay gpg-agent en ejecuci
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "no puedo conectar con el agente - intentando retirada\n"
 
-#: common/audit.c:684
+#: common/audit.c:692
 msgid "Certificate chain available"
 msgstr "Cadena de certificados disponible"
 
-#: common/audit.c:691
+#: common/audit.c:699
 msgid "root certificate missing"
 msgstr "falta el certificado ra�z"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr "Datos cifrados correctamente"
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 msgid "Data available"
 msgstr "Hay datos disponibles"
 
-#: common/audit.c:725
+#: common/audit.c:733
 msgid "Session key created"
 msgstr "Creada clave de sesi�n"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, c-format
 msgid "algorithm: %s"
 msgstr "algoritmo: %s"
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "algoritmo no disponible: %s"
 
-#: common/audit.c:736
+#: common/audit.c:744
 msgid "seems to be not encrypted"
 msgstr "no parece que est� cifrado"
 
-#: common/audit.c:742
+#: common/audit.c:750
 msgid "Number of recipients"
 msgstr "N�mero de destinatarios"
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr "Destinatario %d"
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr "Datos firmados correctamente"
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr "Datos descifrados correctamente"
 
-#: common/audit.c:823
+#: common/audit.c:831
 msgid "Data verification succeeded"
 msgstr "Datos verificados correctamente"
 
-#: common/audit.c:832
+#: common/audit.c:840
 msgid "Signature available"
 msgstr "Firma disponible"
 
-#: common/audit.c:837
+#: common/audit.c:845
 msgid "Parsing signature succeeded"
 msgstr "Firma interpretada correctamente"
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "Algoritmmo de resumen err�neo: %s"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, c-format
 msgid "Signature %d"
 msgstr "Firma %d"
 
-#: common/audit.c:873
+#: common/audit.c:881
 msgid "Certificate chain valid"
 msgstr "Cadena de certificados v�lida"
 
-#: common/audit.c:884
+#: common/audit.c:892
 msgid "Root certificate trustworthy"
 msgstr "Certificado ra�z fiable"
 
-#: common/audit.c:894
+#: common/audit.c:902
 msgid "CRL/OCSP check of certificates"
 msgstr "Comprobaci�n CRL/OCSP de certificados"
 
-#: common/audit.c:911
+#: common/audit.c:919
 msgid "Included certificates"
 msgstr "Certificados incluidos"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr "No auditar entradas de los logs"
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 msgid "Unknown operation"
 msgstr "Operaci�n desconocida"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent utilizable"
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr "Dirmngr utilizable"
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, c-format
 msgid "No help available for `%s'."
 msgstr "No hay ayuda disponible para `%s'."
@@ -1437,7 +1438,7 @@ msgstr "Orden inv
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no se puede abrir `%s'\n"
@@ -1965,15 +1966,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1983,7 +1984,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1991,75 +1992,71 @@ msgstr ""
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr "Clave p�blica: "
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr "Cifrado: "
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr "Bibliotecas utilizadas:"
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, 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:1345
+#: g10/gpg.c:1324
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio personal `%s'\n"
 
-#: g10/gpg.c:1348
+#: g10/gpg.c:1327
 #, 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:1351
+#: g10/gpg.c:1330
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedad insegura de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1357
+#: g10/gpg.c:1336
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio personal `%s'\n"
 
-#: g10/gpg.c:1360
+#: g10/gpg.c:1339
 #, 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:1363
+#: g10/gpg.c:1342
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1369
+#: g10/gpg.c:1348
 #, 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:1372
+#: g10/gpg.c:1351
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2067,18 +2064,18 @@ msgstr ""
 "AVISO: propiedad insegura del directorio contenedor del fichero de\n"
 "configuraci�n `%s'\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1354
 #, 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:1381
+#: g10/gpg.c:1360
 #, 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:1384
+#: g10/gpg.c:1363
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2086,438 +2083,438 @@ msgstr ""
 "AVISO: permisos inseguros del directorio contenedor del fichero de\n"
 "configuraci�n `%s'\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1366
 #, 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:1566
+#: g10/gpg.c:1545
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "art�culo de configuraci�n desconocido `%s'\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr "mostrar foto IDs al listar claves"
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr "mostrar URLS de pol�tica al listar firmas"
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 msgid "show all notations during signature listings"
 msgstr "mostrar todas las notaciones al listar firmas"
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr "mostrar notaciones est�ndar IETF al listar firmas"
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr "mostrar notaciones personalizadas al listar firmas"
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "mostrar URL del servidor de claves preferido al listar firmas"
 
-#: g10/gpg.c:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr "mostrar validez de la ID de usuario al listar claves"
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr "mostar IDs de usuario revocados y caducados al listar firmas"
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr "mostrar subclaves revocadas y expiradas al listar claves"
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 msgid "show the keyring name in key listings"
 msgstr "mostrar nombre de los anillos de claves al listar claves"
 
-#: g10/gpg.c:1688
+#: g10/gpg.c:1667
 msgid "show expiration dates during signature listings"
 msgstr "mostrar fechas de caducidad al listar firmas"
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, 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:1940
+#: g10/gpg.c:1919
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt demasiado antigua (necesito %s, tengo %s)\n"
 
-#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/gpg.c:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' no es una fecha de caducidad v�lida\n"
 
-#: g10/gpg.c:2599
+#: g10/gpg.c:2578
 #, 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:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2613
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2616
 msgid "invalid keyserver options\n"
 msgstr "opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 msgid "invalid import options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 msgid "invalid export options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 msgid "invalid list options\n"
 msgstr "lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr "mostrar foto IDs al verificar firmas"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr "mostrar URLs de pol�tica al verificar firmas"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 msgid "show all notations during signature verification"
 msgstr "mostrar todas las notaciones al verificar firmas"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr "mostrar notaciones est�ndar IETF al verificar firmas"
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr "mostrar notaciones personalizadas al verificar firmas"
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "mostrar URLs del servidor de claves preferido al verificar firmas"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2668
 msgid "show user ID validity during signature verification"
 msgstr "mostrar validez del ID de usuario al verificar firmas"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2670
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "mostrar IDs de usuario revocados y caducados al verificar firmas"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2672
 msgid "show only the primary user ID in signature verification"
 msgstr "mostrar solo ID primario de usuario al verificar firmas"
 
-#: g10/gpg.c:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr "validar firmas con datos PKA"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "aumentar confianza en las firmas con datos v�lidos PKA"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 msgid "invalid verify options\n"
 msgstr "opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: lista de auto-localizaci�n de claves inv�lida\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr "lista de auto-localizaci�n de claves inv�lida\n"
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, 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:3044
+#: g10/gpg.c:3023
 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:3050
+#: g10/gpg.c:3029
 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:3056
+#: g10/gpg.c:3035
 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:3069
+#: g10/gpg.c:3048
 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:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/gpg.c:3170
+#: g10/gpg.c:3149
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3151
 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:3174
+#: g10/gpg.c:3153
 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:3176
+#: g10/gpg.c:3155
 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:3179
+#: g10/gpg.c:3158
 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:3183
+#: g10/gpg.c:3162
 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:3190
+#: g10/gpg.c:3169
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inv�lidas\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inv�lidas\n"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresi�n inv�lidas\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s a�n no funciona con %s\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, 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:3292
+#: g10/gpg.c:3271
 #, 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:3297
+#: g10/gpg.c:3276
 #, 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:3380
+#: g10/gpg.c:3359
 #, 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:3391
+#: g10/gpg.c:3370
 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:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "el cifrado sim�trico de `%s' fall�: %s\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 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:3449
+#: g10/gpg.c:3428
 #, 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:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 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:3500
+#: g10/gpg.c:3479
 #, 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:3520
+#: g10/gpg.c:3499
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepci�n del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3683
+#: g10/gpg.c:3662
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportaci�n de clave fallida: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "b�squeda del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovaci�n al servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -2525,19 +2522,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:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica de certificado inv�lida\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4267
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
-#: g10/gpg.c:4321
+#: g10/gpg.c:4300
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
@@ -2558,11 +2555,11 @@ msgstr "hacer que los conflictos de fecha-hora sean s
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaci�n de estado en este descriptor de fichero"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6753,39 +6750,48 @@ msgstr "|N|Nuevo PIN"
 msgid "run in multi server mode (foreground)"
 msgstr "ejecutar en modo multi servidor (primer plano)"
 
-#: scd/scdaemon.c:111
-msgid "read options from file"
-msgstr "leyendo opciones desde fichero"
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr "|NIVEL|poner el nivel de depurado a NIVEL"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
+#, fuzzy
+msgid "|FILE|write a log to FILE"
+msgstr "|FICHERO|escribir inform de auditor�a a FICHERO"
+
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr "|N|conectar el lector al puerto N"
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOMBRE|usa NOMBRE como driver ct-API"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOMBRE|usa NOMBRE como driver PC/SC"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 msgid "do not use the internal CCID driver"
 msgstr "no usa el driverd del CCID interno"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr "no usa el teclado del lector"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 msgid "allow the use of admin card commands"
 msgstr "permitir �rdenes de administrador en la tarjeta"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: scdaemon [opciones] [ficheros] (-h para ayuda)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6793,16 +6799,16 @@ msgstr ""
 "Sintaxis: scdaemon [opciones] [orden [args]]\n"
 "Demonio de la tarjeta inteligente para GnuPG\n"
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr "use la opci�n `--daemon' para ejectuar el programa en segundo plano\n"
 
-#: scd/scdaemon.c:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "manejador del descriptor %d iniciado\n"
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "manejador del descriptor %d terminado\n"
@@ -7462,10 +7468,6 @@ msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SERVIDOR|usa este servidor de claves"
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr "|NIVEL|poner el nivel de depurado a NIVEL"
-
 #: sm/gpgsm.c:328
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
@@ -7474,11 +7476,11 @@ msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpgsm [opciones] [ficheros] (-h para ayuda)"
 
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7488,59 +7490,59 @@ msgstr ""
 "firma, comprueba, cifra o descifra usando protocolo S/MIME\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: sm/gpgsm.c:629
+#: sm/gpgsm.c:610
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpgsm [opciones] "
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "NOTA: no se podr� cifrar a `%s': %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "modelo de validaci�n desconocido `%s'\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "l�nea %d: falta nombre de entidad\n"
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "  s = saltar esta clave\n"
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr "AVISO: ejecut�ndose con hora del sistema falsificada"
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "importando certificados comunes `%s'\n"
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "no puedo firmar usando `%s': %s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr "esta orden no est� a�n implementada\n"
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7820,8 +7822,8 @@ msgstr "Opciones que controlan la configuraci
 msgid "Options useful for debugging"
 msgstr "Opciones �tiles para el depurado"
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FICHERO|escribir logs en modo servidor en FICHERO"
 
@@ -8205,6 +8207,12 @@ msgstr ""
 "Compara frase contrase�a dada en entrada est�ndar con un fichero de "
 "patrones\n"
 
+#~ msgid "read options from file"
+#~ msgstr "leyendo opciones desde fichero"
+
+#~ msgid "Used libraries:"
+#~ msgstr "Bibliotecas utilizadas:"
+
 #~ msgid "|algo [files]|print message digests"
 #~ msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
diff --git a/po/et.po b/po/et.po
index fc0dfd160..edfbdcbc2 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -92,7 +92,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:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -102,12 +102,12 @@ msgstr "`%s' ei 
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
@@ -320,12 +320,13 @@ msgstr ""
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr ""
 
@@ -333,7 +334,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "otsi v�tmeid v�tmeserverist"
@@ -389,165 +390,165 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Palun saatke veateated aadressil <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: agent/gpg-agent.c:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: agent/gpg-agent.c:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: kataloog on loodud\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1513
+#: agent/gpg-agent.c:1538
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: kataloogi ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1670
+#: agent/gpg-agent.c:1695
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1690
+#: agent/gpg-agent.c:1715
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1695
+#: agent/gpg-agent.c:1720
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: agent/gpg-agent.c:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: j�tsin vahele: %s\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: agent/gpg-agent.c:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 
-#: agent/gpg-agent.c:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -690,12 +691,12 @@ msgid ""
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 #, fuzzy
 msgid "Yes"
 msgstr "jah"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr ""
 
@@ -878,127 +879,127 @@ msgstr ""
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
-#: common/audit.c:684
+#: common/audit.c:692
 #, fuzzy
 msgid "Certificate chain available"
 msgstr "halb sertifikaat"
 
-#: common/audit.c:691
+#: common/audit.c:699
 #, fuzzy
 msgid "root certificate missing"
 msgstr "halb sertifikaat"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr ""
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 #, fuzzy
 msgid "Data available"
 msgstr "V�tme leiate: "
 
-#: common/audit.c:725
+#: common/audit.c:733
 #, fuzzy
 msgid "Session key created"
 msgstr "%s: v�tmehoidla on loodud\n"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, fuzzy, c-format
 msgid "algorithm: %s"
 msgstr "pakend: %s\n"
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: common/audit.c:736
+#: common/audit.c:744
 #, fuzzy
 msgid "seems to be not encrypted"
 msgstr "kr�ptimata"
 
-#: common/audit.c:742
+#: common/audit.c:750
 msgid "Number of recipients"
 msgstr ""
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr ""
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr ""
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr ""
 
-#: common/audit.c:823
+#: common/audit.c:831
 #, fuzzy
 msgid "Data verification succeeded"
 msgstr "allkirja kontroll j�eti �ra\n"
 
-#: common/audit.c:832
+#: common/audit.c:840
 #, fuzzy
 msgid "Signature available"
 msgstr "Allkiri aegus %s\n"
 
-#: common/audit.c:837
+#: common/audit.c:845
 #, fuzzy
 msgid "Parsing signature succeeded"
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, fuzzy, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, fuzzy, c-format
 msgid "Signature %d"
 msgstr "Allkiri aegus %s\n"
 
-#: common/audit.c:873
+#: common/audit.c:881
 #, fuzzy
 msgid "Certificate chain valid"
 msgstr "See v�ti on aegunud!"
 
-#: common/audit.c:884
+#: common/audit.c:892
 #, fuzzy
 msgid "Root certificate trustworthy"
 msgstr "halb sertifikaat"
 
-#: common/audit.c:894
+#: common/audit.c:902
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "halb sertifikaat"
 
-#: common/audit.c:911
+#: common/audit.c:919
 #, fuzzy
 msgid "Included certificates"
 msgstr "halb sertifikaat"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 #, fuzzy
 msgid "Unknown operation"
 msgstr "tundmatu versioon"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, fuzzy, c-format
 msgid "No help available for `%s'."
 msgstr "`%s' kohta abiinfo puudub"
@@ -1451,7 +1452,7 @@ msgstr "Vigane k
 msgid "--output doesn't work for this command\n"
 msgstr "v�ti --output ei t��ta selle k�suga\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' ei �nnestu avada\n"
@@ -1985,15 +1986,15 @@ msgstr ""
 " --list-keys [nimed]        n�ita v�tmeid\n"
 " --fingerprint [nimed]      n�ita s�rmej�lgi\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Palun saatke veateated aadressil <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2003,7 +2004,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2011,561 +2012,557 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr "Avalik v�ti: "
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr "�iffer: "
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr "R�si: "
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr ""
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
 
-#: g10/gpg.c:1345
+#: g10/gpg.c:1324
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1348
+#: g10/gpg.c:1327
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1351
+#: g10/gpg.c:1330
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1357
+#: g10/gpg.c:1336
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1360
+#: g10/gpg.c:1339
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1363
+#: g10/gpg.c:1342
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1369
+#: g10/gpg.c:1348
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1351
 #, 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:1375
+#: g10/gpg.c:1354
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1360
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1363
 #, 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:1387
+#: g10/gpg.c:1366
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1566
+#: g10/gpg.c:1545
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
 
-#: g10/gpg.c:1688
+#: g10/gpg.c:1667
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, 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:1940
+#: g10/gpg.c:1919
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/gpg.c:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2599
+#: g10/gpg.c:2578
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2613
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2616
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 msgid "invalid import options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 msgid "invalid export options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2670
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2672
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2683
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2868
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, 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:3044
+#: g10/gpg.c:3023
 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:3050
+#: g10/gpg.c:3029
 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:3056
+#: g10/gpg.c:3035
 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:3069
+#: g10/gpg.c:3048
 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:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/gpg.c:3170
+#: g10/gpg.c:3149
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3151
 #, 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:3174
+#: g10/gpg.c:3153
 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:3176
+#: g10/gpg.c:3155
 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:3179
+#: g10/gpg.c:3158
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/gpg.c:3183
+#: g10/gpg.c:3162
 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:3190
+#: g10/gpg.c:3169
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku �ifri eelistused\n"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku l�hendi eelistused\n"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei t��ta veel koos %s-ga\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, 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:3292
+#: g10/gpg.c:3271
 #, 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:3297
+#: g10/gpg.c:3276
 #, 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:3380
+#: g10/gpg.c:3359
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3391
+#: g10/gpg.c:3370
 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:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3428
 #, 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:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3500
+#: g10/gpg.c:3479
 #, 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:3520
+#: g10/gpg.c:3499
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3683
+#: g10/gpg.c:3662
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "v�tme eksport eba�nnestus: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4267
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:4321
+#: g10/gpg.c:4300
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -2583,11 +2580,11 @@ msgstr "teata ajatemplite konfliktist ainult hoiatusega"
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Kasuta: gpgv [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6864,60 +6861,68 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111
-#, fuzzy
-msgid "read options from file"
-msgstr "loen v�tmeid failist `%s'\n"
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
+#, fuzzy
+msgid "|FILE|write a log to FILE"
+msgstr "|FAIL|lae laiendusmoodul FAIL"
+
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "�ra kasuta terminali"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "vastuolulised k�sud\n"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7606,10 +7611,6 @@ msgstr "|NIMI|kasuta NIME vaikimisi salajase v
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|kasuta seda v�tmeserverit"
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr ""
-
 #: sm/gpgsm.c:328
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|kasuta �ifri algoritmi NIMI"
@@ -7618,12 +7619,12 @@ msgstr "|NIMI|kasuta 
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|kasuta teatel�hendi algoritmi NIMI"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7634,60 +7635,60 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: sm/gpgsm.c:629
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Kirjeldust ei antud)\n"
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " j = j�ta see v�ti vahele\n"
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "`%s' ei �nnestu sulgeda: %s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7967,8 +7968,8 @@ msgstr ""
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
@@ -8355,6 +8356,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "read options from file"
+#~ msgstr "loen v�tmeid failist `%s'\n"
+
 #~ msgid "|[file]|make a signature"
 #~ msgstr "|[fail]|loo allkiri"
 
diff --git a/po/fi.po b/po/fi.po
index e0cc3b4a2..788c95145 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -108,7 +108,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:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -118,12 +118,12 @@ msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
@@ -336,12 +336,13 @@ msgstr ""
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr ""
 
@@ -349,7 +350,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "etsi avaimia avainpalvelimelta"
@@ -405,166 +406,166 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: agent/gpg-agent.c:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: agent/gpg-agent.c:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: hakemisto luotu\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1513
+#: agent/gpg-agent.c:1538
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: hakemistoa ei voi luoda: %s\n"
 
-#: agent/gpg-agent.c:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1670
+#: agent/gpg-agent.c:1695
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1690
+#: agent/gpg-agent.c:1715
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1695
+#: agent/gpg-agent.c:1720
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ohitettu: %s\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 #, 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:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
 
-#: agent/gpg-agent.c:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -707,12 +708,12 @@ msgid ""
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 #, fuzzy
 msgid "Yes"
 msgstr "kyllä|kylla|joo"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr ""
 
@@ -895,127 +896,127 @@ msgstr ""
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
-#: common/audit.c:684
+#: common/audit.c:692
 #, fuzzy
 msgid "Certificate chain available"
 msgstr "virheellinen varmenne"
 
-#: common/audit.c:691
+#: common/audit.c:699
 #, fuzzy
 msgid "root certificate missing"
 msgstr "virheellinen varmenne"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr ""
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 #, fuzzy
 msgid "Data available"
 msgstr "Avain saatavilla kohteessa: "
 
-#: common/audit.c:725
+#: common/audit.c:733
 #, fuzzy
 msgid "Session key created"
 msgstr "%s: avainrengas luotu\n"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, fuzzy, c-format
 msgid "algorithm: %s"
 msgstr "ascii-koodaus: %s\n"
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
 "\n"
 "Tuetut algoritmit:\n"
 
-#: common/audit.c:736
+#: common/audit.c:744
 #, fuzzy
 msgid "seems to be not encrypted"
 msgstr "salaamaton"
 
-#: common/audit.c:742
+#: common/audit.c:750
 msgid "Number of recipients"
 msgstr ""
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr ""
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr ""
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr ""
 
-#: common/audit.c:823
+#: common/audit.c:831
 #, fuzzy
 msgid "Data verification succeeded"
 msgstr "allekirjoituksen varmistus vaiennetaan\n"
 
-#: common/audit.c:832
+#: common/audit.c:840
 #, fuzzy
 msgid "Signature available"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: common/audit.c:837
+#: common/audit.c:845
 #, fuzzy
 msgid "Parsing signature succeeded"
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, fuzzy, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, fuzzy, c-format
 msgid "Signature %d"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: common/audit.c:873
+#: common/audit.c:881
 #, fuzzy
 msgid "Certificate chain valid"
 msgstr "Tämä avain on vanhentunut!"
 
-#: common/audit.c:884
+#: common/audit.c:892
 #, fuzzy
 msgid "Root certificate trustworthy"
 msgstr "virheellinen varmenne"
 
-#: common/audit.c:894
+#: common/audit.c:902
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "virheellinen varmenne"
 
-#: common/audit.c:911
+#: common/audit.c:919
 #, fuzzy
 msgid "Included certificates"
 msgstr "virheellinen varmenne"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 #, fuzzy
 msgid "Unknown operation"
 msgstr "tuntematon versio"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, fuzzy, c-format
 msgid "No help available for `%s'."
 msgstr "Ei ohjetta aiheesta \"%s\""
@@ -1470,7 +1471,7 @@ msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
@@ -2004,16 +2005,16 @@ msgstr ""
 " --list-keys [nimet]        näytä avaimet\n"
 " --fingerprint [nimet]      näytä sormenjäljet\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2023,7 +2024,7 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2031,562 +2032,558 @@ msgstr ""
 "\n"
 "Tuetut algoritmit:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr "Salaus: "
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 msgid "Compression: "
 msgstr "Pakkaus: "
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr ""
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, 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:1345
+#: g10/gpg.c:1324
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1348
+#: g10/gpg.c:1327
 #, 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:1351
+#: g10/gpg.c:1330
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1357
+#: g10/gpg.c:1336
 #, 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:1360
+#: g10/gpg.c:1339
 #, 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:1363
+#: g10/gpg.c:1342
 #, 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:1369
+#: g10/gpg.c:1348
 #, 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:1372
+#: g10/gpg.c:1351
 #, 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:1375
+#: g10/gpg.c:1354
 #, 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:1381
+#: g10/gpg.c:1360
 #, 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:1384
+#: g10/gpg.c:1363
 #, 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:1387
+#: g10/gpg.c:1366
 #, 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:1566
+#: g10/gpg.c:1545
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
 
-#: g10/gpg.c:1688
+#: g10/gpg.c:1667
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, 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:1940
+#: g10/gpg.c:1919
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
 
-#: g10/gpg.c:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2599
+#: g10/gpg.c:2578
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2613
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2616
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2670
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2672
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2683
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2868
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3023
 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:3050
+#: g10/gpg.c:3029
 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:3056
+#: g10/gpg.c:3035
 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:3069
+#: g10/gpg.c:3048
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/gpg.c:3170
+#: g10/gpg.c:3149
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3151
 #, 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:3174
+#: g10/gpg.c:3153
 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:3176
+#: g10/gpg.c:3155
 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:3179
+#: g10/gpg.c:3158
 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:3183
+#: g10/gpg.c:3162
 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:3190
+#: g10/gpg.c:3169
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, 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:3292
+#: g10/gpg.c:3271
 #, 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:3297
+#: g10/gpg.c:3276
 #, 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:3380
+#: g10/gpg.c:3359
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/gpg.c:3391
+#: g10/gpg.c:3370
 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:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3428
 #, 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:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3500
+#: g10/gpg.c:3479
 #, 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:3520
+#: g10/gpg.c:3499
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key käyttäjätunnus"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key käyttäjätunnus [komennot]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/gpg.c:3683
+#: g10/gpg.c:3662
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4267
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4321
+#: g10/gpg.c:4300
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@ -2604,11 +2601,11 @@ msgstr "käsittele aikaleimakonfliktit pelkkinä varoituksina"
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Käyttö: gpgv [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6930,60 +6927,68 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111
-#, fuzzy
-msgid "read options from file"
-msgstr "luetaan asetukset tiedostosta \"%s\"\n"
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
+#, fuzzy
+msgid "|FILE|write a log to FILE"
+msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
+
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "älä käytä lainkaan päätettä"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "ristiriitainen komento\n"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7672,10 +7677,6 @@ msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|PALVELIN|käytä tätä palvelinta avainten etsimiseen"
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr ""
-
 #: sm/gpgsm.c:328
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|käytä salausalgoritmia NIMI"
@@ -7684,12 +7685,12 @@ msgstr "|NIMI|käytä salausalgoritmia NIMI"
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|käytä viestintiivistealgoritmia NIMI"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7700,60 +7701,60 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: sm/gpgsm.c:629
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Kuvausta ei annettu)\n"
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " o = ohita tämä avain\n"
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8033,8 +8034,8 @@ msgstr ""
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
@@ -8421,6 +8422,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "read options from file"
+#~ msgstr "luetaan asetukset tiedostosta \"%s\"\n"
+
 #~ msgid "|[file]|make a signature"
 #~ msgstr "|[tiedosto]|tee allekirjoitus"
 
diff --git a/po/fr.po b/po/fr.po
index 9e54b7677..53a7da41d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2008-09-30 19:38+0200\n"
 "Last-Translator: Ga�l Qu�ri <gael@lautre.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -98,7 +98,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:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -108,12 +108,12 @@ msgstr "impossible de cr
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
@@ -332,12 +332,13 @@ msgstr ""
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "lire les options de `%s'\n"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr ""
 
@@ -345,7 +346,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "chercher les cl�s avec un serveur de cl�s"
@@ -403,8 +404,8 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
@@ -412,160 +413,160 @@ msgstr ""
 "Signaler toutes anomalies � <gnupg-bugs@gnu.org> (en anglais)\n"
 "et tout probl�me de traduction � <traduc@traduc.org>.\n"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: agent/gpg-agent.c:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, 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:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erreur pendant la cr�ation de `%s': %s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, 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:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent n'est pas disponible dans cette session\n"
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, 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:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "�criture de la cl� secr�te dans `%s'\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "r�pertoire `%s' cr��\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) �chou� dans %s: %s\n"
 
-#: agent/gpg-agent.c:1513
+#: agent/gpg-agent.c:1538
 #, 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:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1670
+#: agent/gpg-agent.c:1695
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1690
+#: agent/gpg-agent.c:1715
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1695
+#: agent/gpg-agent.c:1720
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, 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:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignor�: %s\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 #, 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:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 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:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -708,12 +709,12 @@ msgid ""
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 #, fuzzy
 msgid "Yes"
 msgstr "oui"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr ""
 
@@ -900,128 +901,128 @@ msgstr ""
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
-#: common/audit.c:684
+#: common/audit.c:692
 #, fuzzy
 msgid "Certificate chain available"
 msgstr "mauvais certificat"
 
-#: common/audit.c:691
+#: common/audit.c:699
 #, fuzzy
 msgid "root certificate missing"
 msgstr "mauvais certificat"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr ""
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 #, fuzzy
 msgid "Data available"
 msgstr "lister toutes les donn�es disponibles"
 
-#: common/audit.c:725
+#: common/audit.c:733
 #, fuzzy
 msgid "Session key created"
 msgstr "%s: porte-cl�s cr��\n"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, fuzzy, c-format
 msgid "algorithm: %s"
 msgstr "validit�: %s"
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: common/audit.c:736
+#: common/audit.c:744
 #, fuzzy
 msgid "seems to be not encrypted"
 msgstr "non chiffr�"
 
-#: common/audit.c:742
+#: common/audit.c:750
 #, fuzzy
 msgid "Number of recipients"
 msgstr "R�cipients actuels:\n"
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr ""
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr ""
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr ""
 
-#: common/audit.c:823
+#: common/audit.c:831
 #, fuzzy
 msgid "Data verification succeeded"
 msgstr "v�rification de signature supprim�e\n"
 
-#: common/audit.c:832
+#: common/audit.c:840
 #, fuzzy
 msgid "Signature available"
 msgstr "Signature faite le %s\n"
 
-#: common/audit.c:837
+#: common/audit.c:845
 #, fuzzy
 msgid "Parsing signature succeeded"
 msgstr "Bonne signature de � %s �"
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, fuzzy, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, fuzzy, c-format
 msgid "Signature %d"
 msgstr "Signature faite le %s\n"
 
-#: common/audit.c:873
+#: common/audit.c:881
 #, fuzzy
 msgid "Certificate chain valid"
 msgstr "Cette cl� a expir� !"
 
-#: common/audit.c:884
+#: common/audit.c:892
 #, fuzzy
 msgid "Root certificate trustworthy"
 msgstr "mauvais certificat"
 
-#: common/audit.c:894
+#: common/audit.c:902
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "mauvais certificat"
 
-#: common/audit.c:911
+#: common/audit.c:919
 #, fuzzy
 msgid "Included certificates"
 msgstr "mauvais certificat"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 #, fuzzy
 msgid "Unknown operation"
 msgstr "version inconnue"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, fuzzy, c-format
 msgid "No help available for `%s'."
 msgstr "Pas d'aide disponible pour `%s'"
@@ -1452,7 +1453,7 @@ msgstr "Commande invalide  (essayez 
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
@@ -1992,17 +1993,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Signaler toutes anomalies � <gnupg-bugs@gnu.org> (en anglais)\n"
 "et tout probl�me de traduction � <traduc@traduc.org>.\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2012,7 +2013,7 @@ msgstr ""
 "signer, v�rifier, chiffrer ou d�chiffrer\n"
 "l'op�ration par d�faut d�pend des donn�es entr�es\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2020,89 +2021,85 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr "Cl� publique: "
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr "Chiffrement: "
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr "Hachage: "
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr ""
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, 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:1345
+#: g10/gpg.c:1324
 #, 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:1348
+#: g10/gpg.c:1327
 #, 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:1351
+#: g10/gpg.c:1330
 #, 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:1357
+#: g10/gpg.c:1336
 #, 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:1360
+#: g10/gpg.c:1339
 #, 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:1363
+#: g10/gpg.c:1342
 #, 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:1369
+#: g10/gpg.c:1348
 #, 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:1372
+#: g10/gpg.c:1351
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2110,21 +2107,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:1375
+#: g10/gpg.c:1354
 #, 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:1381
+#: g10/gpg.c:1360
 #, 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:1384
+#: g10/gpg.c:1363
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2132,482 +2129,482 @@ msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
 "fichier de configuration `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1366
 #, 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:1566
+#: g10/gpg.c:1545
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "�l�ment de configuration `%s' inconnu\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 #, 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:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 #, 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:1688
+#: g10/gpg.c:1667
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, 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:1940
+#: g10/gpg.c:1919
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, 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:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, 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:2599
+#: g10/gpg.c:2578
 #, 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:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2613
 #, 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:2637
+#: g10/gpg.c:2616
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: options d'import invalides\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 msgid "invalid import options\n"
 msgstr "options d'import invalides\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 msgid "invalid export options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: options de liste invalides\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 msgid "invalid list options\n"
 msgstr "options de liste invalides\n"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 #, 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:2689
+#: g10/gpg.c:2668
 #, 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:2691
+#: g10/gpg.c:2670
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2672
 #, 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:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 msgid "invalid verify options\n"
 msgstr "options de v�rification invalides\n"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, 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:2889
+#: g10/gpg.c:2868
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, 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:3044
+#: g10/gpg.c:3023
 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:3050
+#: g10/gpg.c:3029
 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:3056
+#: g10/gpg.c:3035
 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:3069
+#: g10/gpg.c:3048
 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:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression s�lectionn� est invalide\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/gpg.c:3170
+#: g10/gpg.c:3149
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3151
 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:3174
+#: g10/gpg.c:3153
 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:3176
+#: g10/gpg.c:3155
 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:3179
+#: g10/gpg.c:3158
 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:3183
+#: g10/gpg.c:3162
 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:3190
+#: g10/gpg.c:3169
 msgid "invalid default preferences\n"
 msgstr "pr�f�rences par d�faut invalides\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 msgid "invalid personal cipher preferences\n"
 msgstr "pr�f�rences de chiffrement personnelles invalides\n"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 msgid "invalid personal digest preferences\n"
 msgstr "pr�f�rences de hachage personnelles invalides\n"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 msgid "invalid personal compress preferences\n"
 msgstr "pr�f�rences de compression personnelles invalides\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne marche pas encore avec %s\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, 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:3292
+#: g10/gpg.c:3271
 #, 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:3297
+#: g10/gpg.c:3276
 #, 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:3380
+#: g10/gpg.c:3359
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/gpg.c:3391
+#: g10/gpg.c:3370
 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:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "le chiffrement sym�trique de `%s' a �chou�: %s\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 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:3449
+#: g10/gpg.c:3428
 #, 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:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 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:3500
+#: g10/gpg.c:3479
 #, 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:3520
+#: g10/gpg.c:3499
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, 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:3683
+#: g10/gpg.c:3662
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'export de la cl� a �chou�: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, 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:3704
+#: g10/gpg.c:3683
 #, 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:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donn�e est invalide\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4267
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donn�e est invalide\n"
 
-#: g10/gpg.c:4321
+#: g10/gpg.c:4300
 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"
 
@@ -2626,11 +2623,11 @@ msgstr ""
 msgid "|FD|write status info to this FD"
 msgstr "|FD|�crire l'�tat sur ce descripteur"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Utilisation: gpgv [options] [fichiers] (-h pour l'aide)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6957,57 +6954,65 @@ msgstr "|N|Nouveau code PIN"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
 #, fuzzy
-msgid "read options from file"
+msgid "|FILE|write a log to FILE"
 msgstr "lire les options de `%s'\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "indiquer les commandes d'administration"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7699,10 +7704,6 @@ msgstr ""
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr ""
-
 #: sm/gpgsm.c:328
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
@@ -7713,12 +7714,12 @@ msgstr "algorithme de chiffrement inconnu"
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7729,60 +7730,60 @@ 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:629
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "utilisation: gpg [options] "
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "impossible de se connecter � `%s': %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "option `%s' inconnue\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Aucune description donn�e)\n"
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "  s = sauter cette cl�\n"
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "impossible d'acc�der � `%s': %s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8068,8 +8069,8 @@ msgstr ""
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
@@ -8455,6 +8456,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "read options from file"
+#~ msgstr "lire les options de `%s'\n"
+
 #~ msgid "generate PGP 2.x compatible messages"
 #~ msgstr "g�n�rer des messages compatibles avec PGP 2.x"
 
diff --git a/po/gl.po b/po/gl.po
index 0e642f808..1a6504a61 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -92,7 +92,7 @@ msgstr "contrasinal err
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -102,12 +102,12 @@ msgstr "non se pode crear `%s': %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
@@ -321,12 +321,13 @@ msgstr ""
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr ""
 
@@ -334,7 +335,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "buscar chaves nun servidor de chaves"
@@ -392,8 +393,8 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
@@ -401,158 +402,158 @@ msgstr ""
 "Por favor, informe dos erros no programa a <gnupg-bugs@gnu.org>,\n"
 "e dos erros na traducci�n a <proxecto@trasno.net>.\n"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: agent/gpg-agent.c:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, 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:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: agent/gpg-agent.c:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: agent/gpg-agent.c:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directorio creado\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, 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:1513
+#: agent/gpg-agent.c:1538
 #, 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:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1670
+#: agent/gpg-agent.c:1695
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1690
+#: agent/gpg-agent.c:1715
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1695
+#: agent/gpg-agent.c:1720
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: agent/gpg-agent.c:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves omitidas\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 #, 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:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
 
-#: agent/gpg-agent.c:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -695,12 +696,12 @@ msgid ""
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 #, fuzzy
 msgid "Yes"
 msgstr "si|sim"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr ""
 
@@ -883,131 +884,131 @@ msgstr ""
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
-#: common/audit.c:684
+#: common/audit.c:692
 #, fuzzy
 msgid "Certificate chain available"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: common/audit.c:691
+#: common/audit.c:699
 #, fuzzy
 msgid "root certificate missing"
 msgstr ""
 "Non se atoparon certificados con confianza non definida.\n"
 "\n"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr ""
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 #, fuzzy
 msgid "Data available"
 msgstr "Chave dispo�ible en: "
 
-#: common/audit.c:725
+#: common/audit.c:733
 #, fuzzy
 msgid "Session key created"
 msgstr "%s: chaveiro creado\n"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, fuzzy, c-format
 msgid "algorithm: %s"
 msgstr "armadura: %s\n"
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: common/audit.c:736
+#: common/audit.c:744
 #, fuzzy
 msgid "seems to be not encrypted"
 msgstr "non cifrado"
 
-#: common/audit.c:742
+#: common/audit.c:750
 msgid "Number of recipients"
 msgstr ""
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr ""
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr ""
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr ""
 
-#: common/audit.c:823
+#: common/audit.c:831
 #, fuzzy
 msgid "Data verification succeeded"
 msgstr "verificaci�n de sinatura suprimida\n"
 
-#: common/audit.c:832
+#: common/audit.c:840
 #, fuzzy
 msgid "Signature available"
 msgstr "A sinatura caducou o %s\n"
 
-#: common/audit.c:837
+#: common/audit.c:845
 #, fuzzy
 msgid "Parsing signature succeeded"
 msgstr "Sinatura correcta de \""
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, fuzzy, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, fuzzy, c-format
 msgid "Signature %d"
 msgstr "A sinatura caducou o %s\n"
 
-#: common/audit.c:873
+#: common/audit.c:881
 #, fuzzy
 msgid "Certificate chain valid"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: common/audit.c:884
+#: common/audit.c:892
 #, fuzzy
 msgid "Root certificate trustworthy"
 msgstr ""
 "Non se atoparon certificados con confianza non definida.\n"
 "\n"
 
-#: common/audit.c:894
+#: common/audit.c:902
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "Certificado correcto"
 
-#: common/audit.c:911
+#: common/audit.c:919
 #, fuzzy
 msgid "Included certificates"
 msgstr "Certificado non v�lido"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 #, fuzzy
 msgid "Unknown operation"
 msgstr "versi�n desco�ecida"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, fuzzy, c-format
 msgid "No help available for `%s'."
 msgstr "Non hai axuda dispo�ible para `%s'"
@@ -1461,7 +1462,7 @@ msgstr "Comando incorrecto (tente \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "non se puido abrir `%s'\n"
@@ -1997,17 +1998,17 @@ msgstr ""
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Por favor, informe dos erros no programa a <gnupg-bugs@gnu.org>,\n"
 "e dos erros na traducci�n a <proxecto@trasno.net>.\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2017,7 +2018,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2025,564 +2026,560 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr "P�blica: "
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr ""
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, 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:1345
+#: g10/gpg.c:1324
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1348
+#: g10/gpg.c:1327
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1351
+#: g10/gpg.c:1330
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1357
+#: g10/gpg.c:1336
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1360
+#: g10/gpg.c:1339
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1363
+#: g10/gpg.c:1342
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1369
+#: g10/gpg.c:1348
 #, 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:1372
+#: g10/gpg.c:1351
 #, 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:1375
+#: g10/gpg.c:1354
 #, 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:1381
+#: g10/gpg.c:1360
 #, 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:1384
+#: g10/gpg.c:1363
 #, 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:1387
+#: g10/gpg.c:1366
 #, 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:1566
+#: g10/gpg.c:1545
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "amosar en que chaveiro est� unha chave listada"
 
-#: g10/gpg.c:1688
+#: g10/gpg.c:1667
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, 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:1940
+#: g10/gpg.c:1919
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s non � para uso normal!\n"
 
-#: g10/gpg.c:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, 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:2599
+#: g10/gpg.c:2578
 #, 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:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2613
 #, 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:2637
+#: g10/gpg.c:2616
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 msgid "invalid import options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 msgid "invalid export options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, 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:2667
+#: g10/gpg.c:2646
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2670
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2672
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2683
 #, 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:2707
+#: g10/gpg.c:2686
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2868
 #, 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:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, 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:3044
+#: g10/gpg.c:3023
 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:3050
+#: g10/gpg.c:3029
 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:3056
+#: g10/gpg.c:3035
 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:3069
+#: g10/gpg.c:3048
 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:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/gpg.c:3170
+#: g10/gpg.c:3149
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3151
 #, 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:3174
+#: g10/gpg.c:3153
 #, 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:3176
+#: g10/gpg.c:3155
 #, 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:3179
+#: g10/gpg.c:3158
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/gpg.c:3183
+#: g10/gpg.c:3162
 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:3190
+#: g10/gpg.c:3169
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non v�lidas\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non v�lidas\n"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non v�lidas\n"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresi�n personais non v�lidas\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�%s a�nda non traballa con %s!\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, 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:3292
+#: g10/gpg.c:3271
 #, 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:3297
+#: g10/gpg.c:3276
 #, 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:3380
+#: g10/gpg.c:3359
 #, 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:3391
+#: g10/gpg.c:3370
 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:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3428
 #, 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:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3500
+#: g10/gpg.c:3479
 #, 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:3520
+#: g10/gpg.c:3499
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3683
+#: g10/gpg.c:3662
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportaci�n da chave fallou: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 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:4288
+#: g10/gpg.c:4267
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:4321
+#: g10/gpg.c:4300
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
@@ -2600,11 +2597,11 @@ msgstr "converte-los conflictos de selo de data nun aviso"
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribi-la informaci�n de estado a este DF"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6939,60 +6936,68 @@ msgstr "Introduza o ID de usuario: "
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111
-#, fuzzy
-msgid "read options from file"
-msgstr "lendo as opci�ns de `%s'\n"
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
+#, fuzzy
+msgid "|FILE|write a log to FILE"
+msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
+
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "non usa-la terminal en absoluto"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "comandos conflictivos\n"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7694,10 +7699,6 @@ msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr ""
-
 #: sm/gpgsm.c:328
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
@@ -7706,12 +7707,12 @@ msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7722,60 +7723,60 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: sm/gpgsm.c:629
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "non se puido conectar a `%s': %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Non se deu unha descrici�n)\n"
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " o = omitir esta chave\n"
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8056,8 +8057,8 @@ msgstr ""
 msgid "Options useful for debugging"
 msgstr "habilitar depuraci�n total"
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
@@ -8446,6 +8447,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "read options from file"
+#~ msgstr "lendo as opci�ns de `%s'\n"
+
 #~ msgid "|[file]|make a signature"
 #~ msgstr "|[ficheiro]|facer unha sinatura"
 
diff --git a/po/hu.po b/po/hu.po
index bd3272d7d..50e04e9d8 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2004-06-19 21:53+0200\n"
 "Last-Translator: Nagy Ferenc L�szl� <nfl@nfllab.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -92,7 +92,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:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -102,12 +102,12 @@ msgstr "Nem tudom l
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
@@ -320,12 +320,13 @@ msgstr ""
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|f�jl|b�v�t� modul bet�lt�se"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr ""
 
@@ -333,7 +334,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "kulcsok keres�se kulcsszerveren"
@@ -389,165 +390,165 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "A hib�kat (angolul) a <gnupg-bugs@gnu.org> c�mre �rja meg!\n"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 #, 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:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, 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:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, 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:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, 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:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: K�nyvt�rat l�trehoztam.\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, 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:1513
+#: agent/gpg-agent.c:1538
 #, 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:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1670
+#: agent/gpg-agent.c:1695
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1690
+#: agent/gpg-agent.c:1715
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1695
+#: agent/gpg-agent.c:1720
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
 
-#: agent/gpg-agent.c:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: kihagyva: %s\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 #, 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:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 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:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -690,12 +691,12 @@ msgid ""
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 #, fuzzy
 msgid "Yes"
 msgstr "igen"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr ""
 
@@ -878,127 +879,127 @@ msgstr ""
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
-#: common/audit.c:684
+#: common/audit.c:692
 #, fuzzy
 msgid "Certificate chain available"
 msgstr "rossz igazol�s"
 
-#: common/audit.c:691
+#: common/audit.c:699
 #, fuzzy
 msgid "root certificate missing"
 msgstr "rossz igazol�s"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr ""
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 #, fuzzy
 msgid "Data available"
 msgstr "Kulcs tal�lhat�: "
 
-#: common/audit.c:725
+#: common/audit.c:733
 #, fuzzy
 msgid "Session key created"
 msgstr "%s: Kulcskarik�t l�trehoztam.\n"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, fuzzy, c-format
 msgid "algorithm: %s"
 msgstr "P�nc�l: %s\n"
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
 "\n"
 "T�mogatott algoritmusok:\n"
 
-#: common/audit.c:736
+#: common/audit.c:744
 #, fuzzy
 msgid "seems to be not encrypted"
 msgstr "nem titkos�tott"
 
-#: common/audit.c:742
+#: common/audit.c:750
 msgid "Number of recipients"
 msgstr ""
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr ""
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr ""
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr ""
 
-#: common/audit.c:823
+#: common/audit.c:831
 #, fuzzy
 msgid "Data verification succeeded"
 msgstr "Al��r�s-ellen�rz�s elnyomva.\n"
 
-#: common/audit.c:832
+#: common/audit.c:840
 #, fuzzy
 msgid "Signature available"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: common/audit.c:837
+#: common/audit.c:845
 #, fuzzy
 msgid "Parsing signature succeeded"
 msgstr "J� al��r�s a k�vetkez�t�l: \""
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, fuzzy, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, fuzzy, c-format
 msgid "Signature %d"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: common/audit.c:873
+#: common/audit.c:881
 #, fuzzy
 msgid "Certificate chain valid"
 msgstr "Ez a kulcs lej�rt!"
 
-#: common/audit.c:884
+#: common/audit.c:892
 #, fuzzy
 msgid "Root certificate trustworthy"
 msgstr "rossz igazol�s"
 
-#: common/audit.c:894
+#: common/audit.c:902
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "rossz igazol�s"
 
-#: common/audit.c:911
+#: common/audit.c:919
 #, fuzzy
 msgid "Included certificates"
 msgstr "rossz igazol�s"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 #, fuzzy
 msgid "Unknown operation"
 msgstr "ismeretlen verzi�"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, fuzzy, c-format
 msgid "No help available for `%s'."
 msgstr "Nem �ll rendelkez�sre seg�ts�g \"%s\" t�m�hoz."
@@ -1451,7 +1452,7 @@ msgstr "
 msgid "--output doesn't work for this command\n"
 msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
@@ -1982,15 +1983,15 @@ msgstr ""
 " --list-keys [nevek]        kulcsok ki�rat�sa\n"
 " --fingerprint [nevek]      ujjlenyomatok ki�rat�sa\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "A hib�kat (angolul) a <gnupg-bugs@gnu.org> c�mre �rja meg!\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2000,7 +2001,7 @@ msgstr ""
 "Al��r�s, ellen�rz�s, titkos�t�s vagy visszafejt�s.\n"
 "Az alap�rtelmezett m�velet a bemeneti adatt�l f�gg.\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2008,562 +2009,558 @@ msgstr ""
 "\n"
 "T�mogatott algoritmusok:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr "Nyilv�nos kulcs� (pubkey): "
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr "Rejtjelez� (cipher): "
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr "Kivonatol� (hash): "
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 msgid "Compression: "
 msgstr "T�m�r�t� (compression): "
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr ""
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, 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:1345
+#: g10/gpg.c:1324
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1348
+#: g10/gpg.c:1327
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1351
+#: g10/gpg.c:1330
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1357
+#: g10/gpg.c:1336
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1360
+#: g10/gpg.c:1339
 #, 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:1363
+#: g10/gpg.c:1342
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1369
+#: g10/gpg.c:1348
 #, 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:1372
+#: g10/gpg.c:1351
 #, 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:1375
+#: g10/gpg.c:1354
 #, 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:1381
+#: g10/gpg.c:1360
 #, 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:1384
+#: g10/gpg.c:1363
 #, 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:1387
+#: g10/gpg.c:1366
 #, 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:1566
+#: g10/gpg.c:1545
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 #, 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:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mutatja a kilist�zott kulcs kulcskarik�j�t is"
 
-#: g10/gpg.c:1688
+#: g10/gpg.c:1667
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, 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:1940
+#: g10/gpg.c:1919
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, 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:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2599
+#: g10/gpg.c:2578
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2613
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2616
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 msgid "invalid import options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 msgid "invalid export options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 #, 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:2689
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2670
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2672
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2683
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, 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:2889
+#: g10/gpg.c:2868
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �rtelmetlen %s mellett!\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, 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:3044
+#: g10/gpg.c:3023
 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:3050
+#: g10/gpg.c:3029
 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:3056
+#: g10/gpg.c:3035
 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:3069
+#: g10/gpg.c:3048
 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:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
 
-#: g10/gpg.c:3170
+#: g10/gpg.c:3149
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3151
 #, 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:3174
+#: g10/gpg.c:3153
 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:3176
+#: g10/gpg.c:3155
 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:3179
+#: g10/gpg.c:3158
 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:3183
+#: g10/gpg.c:3162
 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:3190
+#: g10/gpg.c:3169
 msgid "invalid default preferences\n"
 msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 msgid "invalid personal cipher preferences\n"
 msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 msgid "invalid personal digest preferences\n"
 msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 msgid "invalid personal compress preferences\n"
 msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, 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:3287
+#: g10/gpg.c:3266
 #, 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:3292
+#: g10/gpg.c:3271
 #, 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:3297
+#: g10/gpg.c:3276
 #, 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:3380
+#: g10/gpg.c:3359
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/gpg.c:3391
+#: g10/gpg.c:3370
 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:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [f�jln�v]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [f�jln�v]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [f�jln�v]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3428
 #, 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:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [f�jln�v]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3500
+#: g10/gpg.c:3479
 #, 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:3520
+#: g10/gpg.c:3499
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [f�jln�v]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [f�jln�v]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [f�jln�v]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonos�t�"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonos�t� [parancsok]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3683
+#: g10/gpg.c:3662
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexport�l�s sikertelen: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[f�jln�v]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti g�pelni az �zenetet...\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 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:4288
+#: g10/gpg.c:4267
 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:4321
+#: g10/gpg.c:4300
 #, 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"
@@ -2581,11 +2578,11 @@ msgstr "id
 msgid "|FD|write status info to this FD"
 msgstr "|�L|�llapotinform�ci�k �r�sa �L �llom�nyle�r�ra"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpgv [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6896,60 +6893,68 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111
-#, fuzzy
-msgid "read options from file"
-msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
+#, fuzzy
+msgid "|FILE|write a log to FILE"
+msgstr "|f�jl|b�v�t� modul bet�lt�se"
+
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "ne haszn�lja a termin�lt egy�ltal�n"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7639,10 +7644,6 @@ msgstr "|N
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|G�PN�V|kulcsszerver be�ll�t�sa kulcsok keres�s�hez"
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr ""
-
 #: sm/gpgsm.c:328
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|N�V|N�V rejtjelez� algoritmus haszn�lata"
@@ -7651,12 +7652,12 @@ msgstr "|N
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|N�V|N�V kivonatol� algoritmus haszn�lata"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7667,60 +7668,60 @@ 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:629
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Nincs le�r�s.)\n"
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " h = kulcs kihagy�sa\n"
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, 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:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8000,8 +8001,8 @@ msgstr ""
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
@@ -8388,6 +8389,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "read options from file"
+#~ msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
+
 #~ msgid "|[file]|make a signature"
 #~ msgstr "|[f�jl]|al��r�s k�sz�t�se"
 
diff --git a/po/id.po b/po/id.po
index 8b4161f35..fe22b6b16 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -94,7 +94,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:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -104,12 +104,12 @@ msgstr "tidak dapat membuat %s: %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
@@ -322,12 +322,13 @@ msgstr ""
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr ""
 
@@ -335,7 +336,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cari kunci di key server"
@@ -391,165 +392,165 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Laporkan bug ke <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: agent/gpg-agent.c:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: agent/gpg-agent.c:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: agent/gpg-agent.c:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: direktori tercipta\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1513
+#: agent/gpg-agent.c:1538
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: tidak dapat membuat direktori: %s\n"
 
-#: agent/gpg-agent.c:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1670
+#: agent/gpg-agent.c:1695
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1690
+#: agent/gpg-agent.c:1715
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1695
+#: agent/gpg-agent.c:1720
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: agent/gpg-agent.c:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: dilewati: %s\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: agent/gpg-agent.c:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 
-#: agent/gpg-agent.c:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -692,12 +693,12 @@ msgid ""
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 #, fuzzy
 msgid "Yes"
 msgstr "y|ya"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr ""
 
@@ -880,127 +881,127 @@ msgstr ""
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
-#: common/audit.c:684
+#: common/audit.c:692
 #, fuzzy
 msgid "Certificate chain available"
 msgstr "sertifikat yang buruk"
 
-#: common/audit.c:691
+#: common/audit.c:699
 #, fuzzy
 msgid "root certificate missing"
 msgstr "sertifikat yang buruk"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr ""
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 #, fuzzy
 msgid "Data available"
 msgstr "Kunci tersedia di:"
 
-#: common/audit.c:725
+#: common/audit.c:733
 #, fuzzy
 msgid "Session key created"
 msgstr "%s: keyring tercipta\n"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, fuzzy, c-format
 msgid "algorithm: %s"
 msgstr "armor: %s\n"
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: common/audit.c:736
+#: common/audit.c:744
 #, fuzzy
 msgid "seems to be not encrypted"
 msgstr "tidak dienkripsi"
 
-#: common/audit.c:742
+#: common/audit.c:750
 msgid "Number of recipients"
 msgstr ""
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr ""
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr ""
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr ""
 
-#: common/audit.c:823
+#: common/audit.c:831
 #, fuzzy
 msgid "Data verification succeeded"
 msgstr "verifikasi signature tidak diabaikan\n"
 
-#: common/audit.c:832
+#: common/audit.c:840
 #, fuzzy
 msgid "Signature available"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: common/audit.c:837
+#: common/audit.c:845
 #, fuzzy
 msgid "Parsing signature succeeded"
 msgstr "Signature baik dari \""
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, fuzzy, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, fuzzy, c-format
 msgid "Signature %d"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: common/audit.c:873
+#: common/audit.c:881
 #, fuzzy
 msgid "Certificate chain valid"
 msgstr "Kunci ini telah berakhir!"
 
-#: common/audit.c:884
+#: common/audit.c:892
 #, fuzzy
 msgid "Root certificate trustworthy"
 msgstr "sertifikat yang buruk"
 
-#: common/audit.c:894
+#: common/audit.c:902
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "sertifikat yang buruk"
 
-#: common/audit.c:911
+#: common/audit.c:919
 #, fuzzy
 msgid "Included certificates"
 msgstr "sertifikat yang buruk"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 #, fuzzy
 msgid "Unknown operation"
 msgstr "versi tidak dikenal"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, fuzzy, c-format
 msgid "No help available for `%s'."
 msgstr "Tidak tersedia bantuan untuk `%s'"
@@ -1454,7 +1455,7 @@ msgstr "Perintah tidak valid (coba \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
@@ -1984,15 +1985,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Laporkan bug ke <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2002,7 +2003,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2010,570 +2011,566 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 msgid "Compression: "
 msgstr "Kompresi: "
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr ""
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
 
-#: g10/gpg.c:1345
+#: g10/gpg.c:1324
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1348
+#: g10/gpg.c:1327
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1351
+#: g10/gpg.c:1330
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1357
+#: g10/gpg.c:1336
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1360
+#: g10/gpg.c:1339
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1363
+#: g10/gpg.c:1342
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1369
+#: g10/gpg.c:1348
 #, 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:1372
+#: g10/gpg.c:1351
 #, 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:1375
+#: g10/gpg.c:1354
 #, 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:1381
+#: g10/gpg.c:1360
 #, 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:1384
+#: g10/gpg.c:1363
 #, 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:1387
+#: g10/gpg.c:1366
 #, 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:1566
+#: g10/gpg.c:1545
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/gpg.c:1688
+#: g10/gpg.c:1667
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
-#: g10/gpg.c:1940
+#: g10/gpg.c:1919
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/gpg.c:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2599
+#: g10/gpg.c:2578
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2613
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2616
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2670
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2672
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2683
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2868
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3023
 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:3050
+#: g10/gpg.c:3029
 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:3056
+#: g10/gpg.c:3035
 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:3069
+#: g10/gpg.c:3048
 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:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/gpg.c:3170
+#: g10/gpg.c:3149
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3151
 #, 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:3174
+#: g10/gpg.c:3153
 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:3176
+#: g10/gpg.c:3155
 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:3179
+#: g10/gpg.c:3158
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/gpg.c:3183
+#: g10/gpg.c:3162
 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:3190
+#: g10/gpg.c:3169
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, 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:3292
+#: g10/gpg.c:3271
 #, 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:3297
+#: g10/gpg.c:3276
 #, 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:3380
+#: g10/gpg.c:3359
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/gpg.c:3391
+#: g10/gpg.c:3370
 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:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3428
 #, 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:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3500
+#: g10/gpg.c:3479
 #, 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:3520
+#: g10/gpg.c:3499
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/gpg.c:3683
+#: g10/gpg.c:3662
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4267
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4321
+#: g10/gpg.c:4300
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@ -2591,11 +2588,11 @@ msgstr "buat timestamp konflik hanya sebagai peringatan"
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pemakaian: gpgv [opsi] [file] (-h untuk bantuan)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6890,60 +6887,68 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111
-#, fuzzy
-msgid "read options from file"
-msgstr "membaca pilihan dari `%s'\n"
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
+#, fuzzy
+msgid "|FILE|write a log to FILE"
+msgstr "|FILE|muat modul ekstensi FILE"
+
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "jangan menggunakan terminal"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "perintah saling konflik\n"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7633,10 +7638,6 @@ msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr ""
-
 #: sm/gpgsm.c:328
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
@@ -7645,12 +7646,12 @@ msgstr "|NAMA|gunakan algoritma cipher NAMA"
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7661,60 +7662,60 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: sm/gpgsm.c:629
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Tidak diberikan deskripsi)\n"
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = lewati kunci ini\n"
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7994,8 +7995,8 @@ msgstr ""
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
@@ -8382,6 +8383,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "read options from file"
+#~ msgstr "membaca pilihan dari `%s'\n"
+
 #~ msgid "|[file]|make a signature"
 #~ msgstr "|[file]|buat signature"
 
diff --git a/po/it.po b/po/it.po
index 1b5842ad3..c6833dc10 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2008-05-26 12:02+0200\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -92,7 +92,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:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -102,12 +102,12 @@ msgstr "impossibile creare `%s': %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
@@ -320,12 +320,13 @@ msgstr ""
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr ""
 
@@ -333,7 +334,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cerca delle chiavi su un key server"
@@ -389,165 +390,165 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Per favore segnala i bug a <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: agent/gpg-agent.c:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, 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:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "errore creando `%s': %s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "impossibile creare la directory `%s': %s\n"
 
-#: agent/gpg-agent.c:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: agent/gpg-agent.c:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directory creata\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1513
+#: agent/gpg-agent.c:1538
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: impossibile creare la directory: %s\n"
 
-#: agent/gpg-agent.c:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1670
+#: agent/gpg-agent.c:1695
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1690
+#: agent/gpg-agent.c:1715
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1695
+#: agent/gpg-agent.c:1720
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: agent/gpg-agent.c:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: saltata: %s\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: agent/gpg-agent.c:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 
-#: agent/gpg-agent.c:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -690,12 +691,12 @@ msgid ""
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 #, fuzzy
 msgid "Yes"
 msgstr "si|s�"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr ""
 
@@ -878,127 +879,127 @@ msgstr ""
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
-#: common/audit.c:684
+#: common/audit.c:692
 #, fuzzy
 msgid "Certificate chain available"
 msgstr "certificato danneggiato"
 
-#: common/audit.c:691
+#: common/audit.c:699
 #, fuzzy
 msgid "root certificate missing"
 msgstr "certificato danneggiato"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr ""
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 #, fuzzy
 msgid "Data available"
 msgstr "Chiave disponibile presso: "
 
-#: common/audit.c:725
+#: common/audit.c:733
 #, fuzzy
 msgid "Session key created"
 msgstr "%s: portachiavi creato\n"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, fuzzy, c-format
 msgid "algorithm: %s"
 msgstr "armatura: %s\n"
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: common/audit.c:736
+#: common/audit.c:744
 #, fuzzy
 msgid "seems to be not encrypted"
 msgstr "non cifrato"
 
-#: common/audit.c:742
+#: common/audit.c:750
 msgid "Number of recipients"
 msgstr ""
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr ""
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr ""
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr ""
 
-#: common/audit.c:823
+#: common/audit.c:831
 #, fuzzy
 msgid "Data verification succeeded"
 msgstr "verifica della firma soppressa\n"
 
-#: common/audit.c:832
+#: common/audit.c:840
 #, fuzzy
 msgid "Signature available"
 msgstr "Firma scaduta il %s\n"
 
-#: common/audit.c:837
+#: common/audit.c:845
 #, fuzzy
 msgid "Parsing signature succeeded"
 msgstr "Firma valida da \""
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, fuzzy, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, fuzzy, c-format
 msgid "Signature %d"
 msgstr "Firma scaduta il %s\n"
 
-#: common/audit.c:873
+#: common/audit.c:881
 #, fuzzy
 msgid "Certificate chain valid"
 msgstr "Questa chiave � scaduta!"
 
-#: common/audit.c:884
+#: common/audit.c:892
 #, fuzzy
 msgid "Root certificate trustworthy"
 msgstr "certificato danneggiato"
 
-#: common/audit.c:894
+#: common/audit.c:902
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "certificato danneggiato"
 
-#: common/audit.c:911
+#: common/audit.c:919
 #, fuzzy
 msgid "Included certificates"
 msgstr "certificato danneggiato"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 #, fuzzy
 msgid "Unknown operation"
 msgstr "versione sconosciuta"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, fuzzy, c-format
 msgid "No help available for `%s'."
 msgstr "Non � disponibile un aiuto per `%s'"
@@ -1453,7 +1454,7 @@ msgstr "Comando non valido  (prova \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
@@ -1993,15 +1994,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Per favore segnala i bug a <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2011,7 +2012,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2019,565 +2020,561 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr "Cifrari: "
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 msgid "Compression: "
 msgstr "Compressione: "
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr ""
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, 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:1345
+#: g10/gpg.c:1324
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1348
+#: g10/gpg.c:1327
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1351
+#: g10/gpg.c:1330
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1357
+#: g10/gpg.c:1336
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1360
+#: g10/gpg.c:1339
 #, 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:1363
+#: g10/gpg.c:1342
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1369
+#: g10/gpg.c:1348
 #, 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:1372
+#: g10/gpg.c:1351
 #, 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:1375
+#: g10/gpg.c:1354
 #, 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:1381
+#: g10/gpg.c:1360
 #, 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:1384
+#: g10/gpg.c:1363
 #, 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:1387
+#: g10/gpg.c:1366
 #, 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:1566
+#: g10/gpg.c:1545
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
 
-#: g10/gpg.c:1688
+#: g10/gpg.c:1667
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, 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:1940
+#: g10/gpg.c:1919
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/gpg.c:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2599
+#: g10/gpg.c:2578
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2613
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2616
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2670
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2672
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2683
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2868
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, 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:3044
+#: g10/gpg.c:3023
 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:3050
+#: g10/gpg.c:3029
 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:3056
+#: g10/gpg.c:3035
 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:3069
+#: g10/gpg.c:3048
 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:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/gpg.c:3170
+#: g10/gpg.c:3149
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3151
 #, 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:3174
+#: g10/gpg.c:3153
 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:3176
+#: g10/gpg.c:3155
 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:3179
+#: g10/gpg.c:3158
 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:3183
+#: g10/gpg.c:3162
 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:3190
+#: g10/gpg.c:3169
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, 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:3292
+#: g10/gpg.c:3271
 #, 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:3297
+#: g10/gpg.c:3276
 #, 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:3380
+#: g10/gpg.c:3359
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/gpg.c:3391
+#: g10/gpg.c:3370
 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:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3428
 #, 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:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3500
+#: g10/gpg.c:3479
 #, 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:3520
+#: g10/gpg.c:3499
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/gpg.c:3683
+#: g10/gpg.c:3662
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non � valido\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4267
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:4321
+#: g10/gpg.c:4300
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
@@ -2595,11 +2592,11 @@ msgstr "segnala i conflitti di data solo con un avvertimento"
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato sul FD"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opzioni] [file] (-h per l'aiuto)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6936,60 +6933,68 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111
-#, fuzzy
-msgid "read options from file"
-msgstr "lettura delle opzioni da `%s'\n"
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
+#, fuzzy
+msgid "|FILE|write a log to FILE"
+msgstr "|FILE|carica il modulo di estensione FILE"
+
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "non usa per niente il terminale"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "comandi in conflitto\n"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7678,10 +7683,6 @@ msgstr "|NOME|usa NOME come chiave segreta predefinita"
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr ""
-
 #: sm/gpgsm.c:328
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di cifratura NOME"
@@ -7690,12 +7691,12 @@ msgstr "|NOME|usa l'algoritmo di cifratura NOME"
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di message digest NOME"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7706,60 +7707,60 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: sm/gpgsm.c:629
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "impossibile connettersi a `%s': %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Non � stata data una descrizione)\n"
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = salta questa chiave\n"
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "impossibile chiudere `%s': %s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8039,8 +8040,8 @@ msgstr ""
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
@@ -8427,6 +8428,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "read options from file"
+#~ msgstr "lettura delle opzioni da `%s'\n"
+
 #~ msgid "|[file]|make a signature"
 #~ msgstr "|[file]|fai una firma"
 
diff --git a/po/ja.po b/po/ja.po
index a52a7b41e..65f9c7676 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.3.92\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2004-11-23 11:14+0900\n"
 "Last-Translator: IIDA Yosiaki <iida@gnu.org>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -96,7 +96,7 @@ msgstr "
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -106,12 +106,12 @@ msgstr "
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
@@ -324,12 +324,13 @@ msgstr ""
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr ""
 
@@ -337,7 +338,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "�������С��θ��򸡺�����"
@@ -393,165 +394,165 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "�Х��򸫤Ĥ����� <gnupg-bugs@gnu.org> �ޤǤ���𤯤�������\n"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: agent/gpg-agent.c:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "��%s�פκ������顼: %s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "������PIN�μ������顼: %s\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "��%s�פǿ��ѥ쥳���ɤθ������顼: %s\n"
 
-#: agent/gpg-agent.c:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ��Ǥ��ޤ���\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d)��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1513
+#: agent/gpg-agent.c:1538
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1670
+#: agent/gpg-agent.c:1695
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1690
+#: agent/gpg-agent.c:1715
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1695
+#: agent/gpg-agent.c:1720
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: �����å�: %s\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: agent/gpg-agent.c:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
 
-#: agent/gpg-agent.c:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -694,12 +695,12 @@ msgid ""
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 #, fuzzy
 msgid "Yes"
 msgstr "yes"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr ""
 
@@ -881,128 +882,128 @@ msgstr ""
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
-#: common/audit.c:684
+#: common/audit.c:692
 #, fuzzy
 msgid "Certificate chain available"
 msgstr "�����ʾ�����Ǥ�"
 
-#: common/audit.c:691
+#: common/audit.c:699
 #, fuzzy
 msgid "root certificate missing"
 msgstr "�����ʾ�����Ǥ�"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr ""
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 #, fuzzy
 msgid "Data available"
 msgstr "��ͭ���ǡ�����ɽ��"
 
-#: common/audit.c:725
+#: common/audit.c:733
 #, fuzzy
 msgid "Session key created"
 msgstr "%s: ���ؤ��Ǥ��ޤ���\n"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, fuzzy, c-format
 msgid "algorithm: %s"
 msgstr "ͭ����: %s"
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: common/audit.c:736
+#: common/audit.c:744
 #, fuzzy
 msgid "seems to be not encrypted"
 msgstr "�Ź沽����Ƥ��ޤ���"
 
-#: common/audit.c:742
+#: common/audit.c:750
 #, fuzzy
 msgid "Number of recipients"
 msgstr "������:\n"
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr ""
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr ""
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr ""
 
-#: common/audit.c:823
+#: common/audit.c:831
 #, fuzzy
 msgid "Data verification succeeded"
 msgstr "��̾�θ��ڤ��ά\n"
 
-#: common/audit.c:832
+#: common/audit.c:840
 #, fuzzy
 msgid "Signature available"
 msgstr "%s�˻ܤ��줿��̾\n"
 
-#: common/audit.c:837
+#: common/audit.c:845
 #, fuzzy
 msgid "Parsing signature succeeded"
 msgstr "��%s�ɤ������������̾"
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, fuzzy, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, fuzzy, c-format
 msgid "Signature %d"
 msgstr "%s�˻ܤ��줿��̾\n"
 
-#: common/audit.c:873
+#: common/audit.c:881
 #, fuzzy
 msgid "Certificate chain valid"
 msgstr "���θ�����λ�Ǥ�!"
 
-#: common/audit.c:884
+#: common/audit.c:892
 #, fuzzy
 msgid "Root certificate trustworthy"
 msgstr "�����ʾ�����Ǥ�"
 
-#: common/audit.c:894
+#: common/audit.c:902
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "�����ʾ�����Ǥ�"
 
-#: common/audit.c:911
+#: common/audit.c:919
 #, fuzzy
 msgid "Included certificates"
 msgstr "�����ʾ�����Ǥ�"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 #, fuzzy
 msgid "Unknown operation"
 msgstr "̤�ΤΥС������Ǥ�"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, fuzzy, c-format
 msgid "No help available for `%s'."
 msgstr "��%s�פΥإ�פϤ���ޤ���"
@@ -1427,7 +1428,7 @@ msgstr "̵
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "��%s�פ������ޤ���\n"
@@ -1948,15 +1949,15 @@ msgstr ""
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "�Х��򸫤Ĥ����� <gnupg-bugs@gnu.org> �ޤǤ���𤯤�������\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1966,7 +1967,7 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1974,551 +1975,547 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr "������: "
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr "�Ź�ˡ: "
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr "�ϥå���: "
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 msgid "Compression: "
 msgstr "����: "
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr ""
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "��Ω���륳�ޥ��\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=���椬�����롼�������%s����˸��Ĥ���ޤ���\n"
 
-#: g10/gpg.c:1345
+#: g10/gpg.c:1324
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1348
+#: g10/gpg.c:1327
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1351
+#: g10/gpg.c:1330
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1357
+#: g10/gpg.c:1336
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1360
+#: g10/gpg.c:1339
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1363
+#: g10/gpg.c:1342
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1369
+#: g10/gpg.c:1348
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1351
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1354
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1360
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1363
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1366
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1566
+#: g10/gpg.c:1545
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "̤�Τι������ܡ�%s��\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/gpg.c:1688
+#: g10/gpg.c:1667
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 
-#: g10/gpg.c:1940
+#: g10/gpg.c:1919
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s�ϻȤ��ޤ���!\n"
 
-#: g10/gpg.c:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2599
+#: g10/gpg.c:2578
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 msgid "could not parse keyserver URL\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2613
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2616
 msgid "invalid keyserver options\n"
 msgstr "̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 msgid "invalid import options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 msgid "invalid export options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 msgid "invalid list options\n"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2670
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2672
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 msgid "invalid verify options\n"
 msgstr "̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2868
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ�˻ȤäƤ�̵��̣�Ǥ�!\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3023
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3029
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ沽��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/gpg.c:3056
+#: g10/gpg.c:3035
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/gpg.c:3069
+#: g10/gpg.c:3048
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
 
-#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 msgid "selected compression algorithm is invalid\n"
 msgstr "���򤵤줿���̥��르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3170
+#: g10/gpg.c:3149
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3151
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3174
+#: g10/gpg.c:3153
 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:3176
+#: g10/gpg.c:3155
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "̵����min-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3158
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/gpg.c:3183
+#: g10/gpg.c:3162
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3190
+#: g10/gpg.c:3169
 msgid "invalid default preferences\n"
 msgstr "̵���ʴ��������\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 msgid "invalid personal cipher preferences\n"
 msgstr "̵���ʸĿ��ѰŹ�ˡ������\n"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 msgid "invalid personal digest preferences\n"
 msgstr "̵���ʸĿ������������\n"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 msgid "invalid personal compress preferences\n"
 msgstr "̵���ʸĿ��Ѱ��̤�����\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3271
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3276
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3359
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3391
+#: g10/gpg.c:3370
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3428
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3500
+#: g10/gpg.c:3479
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3499
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3683
+#: g10/gpg.c:3662
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å��������ǤäƤ������� ...\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4267
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4321
+#: g10/gpg.c:4300
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
@@ -2537,11 +2534,11 @@ msgstr ""
 "|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
 "�񤭹���"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpgv [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6711,57 +6708,65 @@ msgstr "
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
 #, fuzzy
-msgid "read options from file"
+msgid "|FILE|write a log to FILE"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "�������ޥ�ɤ�ɽ��"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7452,10 +7457,6 @@ msgstr ""
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr ""
-
 #: sm/gpgsm.c:328
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
@@ -7466,12 +7467,12 @@ msgstr "̤
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7482,60 +7483,60 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: sm/gpgsm.c:629
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "̤�ΤΥ��ץ�����%s��\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(�����Ϥ���ޤ���)\n"
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "  s = ���θ��ϤȤФ�\n"
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "��%s�פ˥��������Ǥ��ޤ���: %s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7813,8 +7814,8 @@ msgstr ""
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
@@ -8200,6 +8201,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "read options from file"
+#~ msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
+
 #~ msgid "|[file]|make a signature"
 #~ msgstr "|[�ե�����]|��̾�����"
 
diff --git a/po/nb.po b/po/nb.po
index 1ce317c09..bd2542fa3 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.3\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2006-06-13 20:31+0200\n"
 "Last-Translator: Trond Endrest�l <Trond.Endrestol@fagskolen.gjovik.no>\n"
 "Language-Team: Norwegian Bokm�l <i18n-nb@lister.ping.uio.no>\n"
@@ -96,7 +96,7 @@ msgstr "ugyldig passfrase"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -106,12 +106,12 @@ msgstr "kan ikke opprette 
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �pne �%s�: %s\n"
@@ -324,12 +324,13 @@ msgstr ""
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "leser valg fra �%s�\n"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr ""
 
@@ -337,7 +338,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "s�ke etter n�kler p� en n�kkelserver"
@@ -393,163 +394,163 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Vennligst rapporter feil til <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: agent/gpg-agent.c:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MERK: ingen standard valgfil �%s�\n"
 
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "valgfil �%s�: %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leser valg fra �%s�\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: agent/gpg-agent.c:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "feil ved henting av ny PIN: %s\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, 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:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skriver hemmelig n�kkel til �%s�\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen �%s� ble opprettet\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) mislyktes in %s: %s\n"
 
-#: agent/gpg-agent.c:1513
+#: agent/gpg-agent.c:1538
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: agent/gpg-agent.c:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1670
+#: agent/gpg-agent.c:1695
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1690
+#: agent/gpg-agent.c:1715
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1695
+#: agent/gpg-agent.c:1720
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "oppdatering av hemmelig mislyktes: %s\n"
 
-#: agent/gpg-agent.c:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: hoppet over: %s\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -689,12 +690,12 @@ msgid ""
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 #, fuzzy
 msgid "Yes"
 msgstr "ja"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr ""
 
@@ -873,126 +874,126 @@ msgstr ""
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
-#: common/audit.c:684
+#: common/audit.c:692
 #, fuzzy
 msgid "Certificate chain available"
 msgstr "ugyldig sertifikat"
 
-#: common/audit.c:691
+#: common/audit.c:699
 #, fuzzy
 msgid "root certificate missing"
 msgstr "ugyldig sertifikat"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr ""
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 #, fuzzy
 msgid "Data available"
 msgstr "vis alle tilgjengelige data"
 
-#: common/audit.c:725
+#: common/audit.c:733
 #, fuzzy
 msgid "Session key created"
 msgstr "n�kkelknippet �%s� ble opprettet\n"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, fuzzy, c-format
 msgid "algorithm: %s"
 msgstr "gyldighet: %s"
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
 "\n"
 "St�ttede algoritmer:\n"
 
-#: common/audit.c:736
+#: common/audit.c:744
 #, fuzzy
 msgid "seems to be not encrypted"
 msgstr "ikke kryptert"
 
-#: common/audit.c:742
+#: common/audit.c:750
 msgid "Number of recipients"
 msgstr ""
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr ""
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr ""
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr ""
 
-#: common/audit.c:823
+#: common/audit.c:831
 msgid "Data verification succeeded"
 msgstr ""
 
-#: common/audit.c:832
+#: common/audit.c:840
 #, fuzzy
 msgid "Signature available"
 msgstr "Signatur opprettet %s\n"
 
-#: common/audit.c:837
+#: common/audit.c:845
 #, fuzzy
 msgid "Parsing signature succeeded"
 msgstr "ingen signatur ble funnet\n"
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, fuzzy, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "ugyldig hashalgoritme �%s�\n"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, fuzzy, c-format
 msgid "Signature %d"
 msgstr "Signatur opprettet %s\n"
 
-#: common/audit.c:873
+#: common/audit.c:881
 #, fuzzy
 msgid "Certificate chain valid"
 msgstr "Denne n�kkelen er utg�tt!"
 
-#: common/audit.c:884
+#: common/audit.c:892
 #, fuzzy
 msgid "Root certificate trustworthy"
 msgstr "ugyldig sertifikat"
 
-#: common/audit.c:894
+#: common/audit.c:902
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "ugyldig sertifikat"
 
-#: common/audit.c:911
+#: common/audit.c:919
 #, fuzzy
 msgid "Included certificates"
 msgstr "ugyldig sertifikat"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 #, fuzzy
 msgid "Unknown operation"
 msgstr "ukjent versjon"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, c-format
 msgid "No help available for `%s'."
 msgstr ""
@@ -1414,7 +1415,7 @@ msgstr "Ugyldig kommando  (pr
 msgid "--output doesn't work for this command\n"
 msgstr "--output virker ikke for denne kommandoen\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �pne �%s�\n"
@@ -1936,15 +1937,15 @@ msgstr ""
 " --list-keys [navn]         vise n�kler\n"
 " --fingerprint [navn]       vise fingeravtrykk\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Vennligst rapporter feil til <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1954,7 +1955,7 @@ msgstr ""
 "signere, sjekke, kryptere eller dekryptere\n"
 "standard operasjon avhenger av inputdata\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1962,76 +1963,72 @@ msgstr ""
 "\n"
 "St�ttede algoritmer:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr "Offentlig n�kkel: "
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 msgid "Compression: "
 msgstr "Kompresjon: "
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr ""
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "motstridende kommandoer\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "fant ingen �=�-tegn i gruppedefinisjonen �%s�\n"
 
-#: g10/gpg.c:1345
+#: g10/gpg.c:1324
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� hjemmekatalogen �%s�\n"
 
-#: g10/gpg.c:1348
+#: g10/gpg.c:1327
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1351
+#: g10/gpg.c:1330
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� utvidelsen �%s�\n"
 
-#: g10/gpg.c:1357
+#: g10/gpg.c:1336
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� hjemmekatalogen �%s�\n"
 
-#: g10/gpg.c:1360
+#: g10/gpg.c:1339
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1363
+#: g10/gpg.c:1342
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� utvidelsen �%s�\n"
 
-#: g10/gpg.c:1369
+#: g10/gpg.c:1348
 #, 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:1372
+#: g10/gpg.c:1351
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2039,20 +2036,20 @@ msgstr ""
 "ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over konfigurasjonsfilen �%"
 "s�\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1354
 #, 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:1381
+#: g10/gpg.c:1360
 #, 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:1384
+#: g10/gpg.c:1363
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2060,456 +2057,456 @@ msgstr ""
 "ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over "
 "konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1366
 #, 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:1566
+#: g10/gpg.c:1545
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukjent konfigurasjonspunkt �%s�\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 msgid "show the keyring name in key listings"
 msgstr "vise navnet til n�kkelknippene i n�kkellister"
 
-#: g10/gpg.c:1688
+#: g10/gpg.c:1667
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MERK: den gamle valgfila �%s� ble ignorert\n"
 
-#: g10/gpg.c:1940
+#: g10/gpg.c:1919
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MERK: %s er ikke for vanlig bruk!\n"
 
 # Tenk litt p� denne du, Trond.
-#: g10/gpg.c:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�%s� er ikke en gyldig signaturutg�else\n"
 
-#: g10/gpg.c:2599
+#: g10/gpg.c:2578
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�%s� er ikke et gyldig tegnsett\n"
 
-#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 msgid "could not parse keyserver URL\n"
 msgstr "kunne ikke parse n�kkelserverens URL\n"
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2613
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2616
 msgid "invalid keyserver options\n"
 msgstr "ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importvalg\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 msgid "invalid import options\n"
 msgstr "ugyldige importvalg\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 msgid "invalid export options\n"
 msgstr "ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listevalg\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 msgid "invalid list options\n"
 msgstr "ugyldige listevalg\n"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 msgid "show all notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2668
 msgid "show user ID validity during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2670
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2672
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 msgid "invalid verify options\n"
 msgstr "ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunne ikke sette exec-path til %s\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overstyrere %s\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s er ikke tillatt sammen med %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er ikke fornuftig med %s!\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr ""
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3023
 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:3050
+#: g10/gpg.c:3029
 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:3056
+#: g10/gpg.c:3035
 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:3069
+#: g10/gpg.c:3048
 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:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt krypteringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "valg digestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt kompresjonsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt sertifikasjondigestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m� v�re st�rre enn 0\n"
 
-#: g10/gpg.c:3170
+#: g10/gpg.c:3149
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-neede m� v�re st�rre enn 1\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3151
 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:3174
+#: g10/gpg.c:3153
 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:3176
+#: g10/gpg.c:3155
 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:3179
+#: g10/gpg.c:3158
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MERK: enkel S2K-modus (0) er sterkt frar�det\n"
 
-#: g10/gpg.c:3183
+#: g10/gpg.c:3162
 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:3190
+#: g10/gpg.c:3169
 msgid "invalid default preferences\n"
 msgstr "ugyldig standard preferanser\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldig personlig cipherpreferanser\n"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldig personlig digestpreferanser\n"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldig personlig kompresjonspreferanser\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker ikke enn� med %s\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, 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:3292
+#: g10/gpg.c:3271
 #, 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:3297
+#: g10/gpg.c:3276
 #, 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:3380
+#: g10/gpg.c:3359
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3391
+#: g10/gpg.c:3370
 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:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [filnavn]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av �%s� mislyktes: %s\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnavn]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3428
 #, 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:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [filnavn]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3500
+#: g10/gpg.c:3479
 #, 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:3520
+#: g10/gpg.c:3499
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnavn]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key brukerid"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key brukerid"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key brukerid [kommandoer]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sending til n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "mottak fra n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3683
+#: g10/gpg.c:3662
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "n�kkeleksport mislyktes: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "s�k p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hashalgoritme �%s�\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "Sett i gang og tast inn meldingen din ...\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angitte URLen for sertifikasjonspolicyen er ugyldig\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4267
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angitte URLen for signaturpolicy er ugyldig\n"
 
-#: g10/gpg.c:4321
+#: g10/gpg.c:4300
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angitte URLen for den foretrukkede n�kkelserveren er ugyldig\n"
 
@@ -2526,11 +2523,11 @@ msgstr "la konflikter mellom tidsstempler bare v
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skrive statusinfo til denne FD"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Bruksm�te: gpgv [valg] [filer] (-h for hjelp)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6646,57 +6643,65 @@ msgstr "|N|Ny PIN"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
 #, fuzzy
-msgid "read options from file"
+msgid "|FILE|write a log to FILE"
 msgstr "leser valg fra �%s�\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "vise admin-kommandoer"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7383,10 +7388,6 @@ msgstr ""
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr ""
-
 #: sm/gpgsm.c:328
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
@@ -7397,12 +7398,12 @@ msgstr "ukjent kryptoalgoritme"
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s signatur, digestalgoritme %s\n"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7413,60 +7414,60 @@ msgstr ""
 "signere, sjekke, kryptere eller dekryptere\n"
 "standard operasjon avhenger av inputdata\n"
 
-#: sm/gpgsm.c:629
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "ukjent valg �%s�\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr ""
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "  s = hopp over denne n�kkelen\n"
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "kunne ikke parse n�kkelserverens URL\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan ikke aksere �%s�: %s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7744,8 +7745,8 @@ msgstr ""
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
@@ -8130,6 +8131,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "read options from file"
+#~ msgstr "leser valg fra �%s�\n"
+
 #~ msgid "generate PGP 2.x compatible messages"
 #~ msgstr "generere PGP 2.x-kompatible meldinger"
 
diff --git a/po/pl.po b/po/pl.po
index 724fab87a..0874514f0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.0.7\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2007-11-26 19:01+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -92,7 +92,7 @@ msgstr "Has
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "klucze ssh wi�ksze ni� %d bit�w nie s� obs�ugiwane\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -102,12 +102,12 @@ msgstr "nie mo
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
@@ -330,11 +330,12 @@ msgstr "wyj
 msgid "csh-style command output"
 msgstr "wyj�cie polece� w stylu csh"
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|PLIK|odczyt opcji z PLIKU"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr "nie odczepianie od konsoli"
 
@@ -342,7 +343,7 @@ msgstr "nie odczepianie od konsoli"
 msgid "do not grab keyboard and mouse"
 msgstr "nie przechwytywanie klawiatury i myszy"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "u�ycie pliku loga dla serwera"
 
@@ -394,17 +395,17 @@ msgstr "w
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|PLIK|zapis ustawie� �rodowiska tak�e do PLIKU"
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "B��dy prosimy zg�asza� na adres <"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Wywo�anie: gpg-agent [opcje] (-h podaje pomoc)"
 
-#: agent/gpg-agent.c:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -412,145 +413,145 @@ msgstr ""
 "Sk�adnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
 "Zarz�dzanie kluczem tajnym dla GnuPG\n"
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "podano b��dny poziom diagnostyki ,,%s''\n"
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "biblioteka %s jest zbyt stara (potrzebna %s, zainstalowana %s)\n"
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "b��d tworzenia ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nie mo�na utworzy� katalogu ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr "nazwa gniazda zbyt d�uga\n"
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "nie mo�na utworzy� gniazda: %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "nazwa gniazda zbyt d�uga\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent ju� dzia�a - nie uruchamianie nowego\n"
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "b��d podczas odczytu nowego PIN-u: %s\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "b��d podczas przypisywania gniazda do ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() nie powiod�o si�: %s\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "nas�uchiwanie na gnie�dzie ,,%s''\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalog ,,%s'' utworzony\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() nie powiod�o si� dla ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1513
+#: agent/gpg-agent.c:1538
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "nie mo�na u�y� ,,%s'' jako katalogu domowego\n"
 
-#: agent/gpg-agent.c:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "b��d odczytu z %s: %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "obs�uga 0x%lx dla fd %d uruchomiona\n"
 
-#: agent/gpg-agent.c:1670
+#: agent/gpg-agent.c:1695
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "obs�uga 0x%lx dla fd %d zako�czona\n"
 
-#: agent/gpg-agent.c:1690
+#: agent/gpg-agent.c:1715
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "obs�uga ssh 0x%lx dla fd %d uruchomiona\n"
 
-#: agent/gpg-agent.c:1695
+#: agent/gpg-agent.c:1720
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "obs�uga ssh 0x%lx dla fd %d zako�czona\n"
 
-#: agent/gpg-agent.c:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select nie powiod�o si�: %s - czekanie 1s\n"
 
-#: agent/gpg-agent.c:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s zatrzymany\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 msgid "no gpg-agent running in this session\n"
 msgstr "brak dzia�aj�cego gpg-agenta w tej sesji\n"
 
-#: agent/gpg-agent.c:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "z�y format zmiennej �rodowiskowej GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -698,11 +699,11 @@ msgstr ""
 "Czy absolutnie ufasz, �e%%0A  ,,%s''%%0Apoprawnie po�wiadcza certyfikaty "
 "u�ytkownik�w?"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 msgid "Yes"
 msgstr "Tak"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr "Nie"
 
@@ -882,128 +883,128 @@ msgstr "dirmngr nie dzia
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "nie mo�na po��czy� si� z dirmngr - pr�ba fallbacku\n"
 
-#: common/audit.c:684
+#: common/audit.c:692
 #, fuzzy
 msgid "Certificate chain available"
 msgstr "�a�cuch certyfikat�w zbyt d�ugi\n"
 
-#: common/audit.c:691
+#: common/audit.c:699
 #, fuzzy
 msgid "root certificate missing"
 msgstr "certyfikat g��wny jest dobry\n"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr ""
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 #, fuzzy
 msgid "Data available"
 msgstr "wypisanie wszystkich dost�pnych danych"
 
-#: common/audit.c:725
+#: common/audit.c:733
 #, fuzzy
 msgid "Session key created"
 msgstr "%s: zbi�r kluczy utworzony\n"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, fuzzy, c-format
 msgid "algorithm: %s"
 msgstr "poprawno��: %s"
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: common/audit.c:736
+#: common/audit.c:744
 #, fuzzy
 msgid "seems to be not encrypted"
 msgstr "(to nie wygl�da na zaszyfrowan� wiadomo��)\n"
 
-#: common/audit.c:742
+#: common/audit.c:750
 #, fuzzy
 msgid "Number of recipients"
 msgstr "Aktualni odbiorcy:\n"
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr ""
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr ""
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr ""
 
-#: common/audit.c:823
+#: common/audit.c:831
 #, fuzzy
 msgid "Data verification succeeded"
 msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
 
-#: common/audit.c:832
+#: common/audit.c:840
 #, fuzzy
 msgid "Signature available"
 msgstr "Podpisano w "
 
-#: common/audit.c:837
+#: common/audit.c:845
 #, fuzzy
 msgid "Parsing signature succeeded"
 msgstr "nie znaleziono podpisu\n"
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, fuzzy, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "niew�a�ciwy algorytm skr�tu ,,%s''\n"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, fuzzy, c-format
 msgid "Signature %d"
 msgstr "Podpisano w "
 
-#: common/audit.c:873
+#: common/audit.c:881
 #, fuzzy
 msgid "Certificate chain valid"
 msgstr "certyfikat jeszcze nie jest wa�ny"
 
-#: common/audit.c:884
+#: common/audit.c:892
 #, fuzzy
 msgid "Root certificate trustworthy"
 msgstr "certyfikat g��wny jest dobry\n"
 
-#: common/audit.c:894
+#: common/audit.c:902
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "nie znaleziono CRL dla certyfikatu"
 
-#: common/audit.c:911
+#: common/audit.c:919
 #, fuzzy
 msgid "Included certificates"
 msgstr "eksport certyfikat�w"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 #, fuzzy
 msgid "Unknown operation"
 msgstr "nieznana opcja ,,%s''\n"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, fuzzy, c-format
 msgid "No help available for `%s'."
 msgstr "Brak pomocy o ,,%s''"
@@ -1428,7 +1429,7 @@ msgstr "Niepoprawne polecenie  (spr
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie dzia�a z tym poleceniem\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo�na otworzy� ,,%s''\n"
@@ -1951,15 +1952,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazanie klucze\n"
 " --fingerprint [nazwy]      pokazanie odcisk�w kluczy\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1969,7 +1970,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1977,80 +1978,76 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr "Skr�t�w: "
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 msgid "Compression: "
 msgstr "Kompresji: "
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr ""
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
 
-#: g10/gpg.c:1345
+#: g10/gpg.c:1324
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu domowego ,,%s''\n"
 
-#: g10/gpg.c:1348
+#: g10/gpg.c:1327
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do pliku konfiguracyjnego ,,%s''\n"
 
-#: g10/gpg.c:1351
+#: g10/gpg.c:1330
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do rozszerzenia ,,%s''\n"
 
-#: g10/gpg.c:1357
+#: g10/gpg.c:1336
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu domowego ,,%s''\n"
 
-#: g10/gpg.c:1360
+#: g10/gpg.c:1339
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do pliku konfiguracyjnego ,,%s''\n"
 
-#: g10/gpg.c:1363
+#: g10/gpg.c:1342
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do rozszerzenia ,,%s''\n"
 
-#: g10/gpg.c:1369
+#: g10/gpg.c:1348
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego katalog "
 "domowy ,,%s''\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1351
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2058,21 +2055,21 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego plik "
 "konfiguracyjny ,,%s''\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1354
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego "
 "rozszerzenie ,,%s''\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1360
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego katalog "
 "domowy ,,%s''\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1363
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2080,465 +2077,465 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego plik "
 "konfiguracyjny ,,%s''\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1366
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego "
 "rozszerzenie ,,%s''\n"
 
-#: g10/gpg.c:1566
+#: g10/gpg.c:1545
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nieznana opcja konfiguracyjna ,,%s''\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr "wy�wietlenie ID zdj�� przy wypisywaniu kluczy"
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr "pokazywanie URL-i polityk przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 msgid "show all notations during signature listings"
 msgstr "pokazywanie wszystkich adnotacji przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr "pokazywanie standardowych adnotacji IETF przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr "pokazywanie adnotacji u�ytkownika przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "pokazywanie URL-i preferowanych serwer�w kluczy przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr "pokazywanie poprawno�ci ID u�ytkownika przy wypisywaniu kluczy"
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "pokazywanie uniewa�nionych i wygas�ych ID u�ytkownika na listach kluczy"
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr "pokazywanie uniewa�nionych i wygas�ych podkluczy na listach kluczy"
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 msgid "show the keyring name in key listings"
 msgstr "pokazywanie nazwy zbioru kluczy na listach kluczy"
 
-#: g10/gpg.c:1688
+#: g10/gpg.c:1667
 msgid "show expiration dates during signature listings"
 msgstr "pokazywanie dat wyga�ni�cia przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, 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:1940
+#: g10/gpg.c:1919
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 "biblioteka libgcrypt jest zbyt stara (potrzebna %s, zainstalowana %s)\n"
 
-#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/gpg.c:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr ",,%s'' nie jest poprawnym czasem wyga�ni�cia podpisu\n"
 
-#: g10/gpg.c:2599
+#: g10/gpg.c:2578
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr ",,%s'' nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozumia�y URL serwera kluczy\n"
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2613
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: niepoprawne opcje serwera kluczy\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2616
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje serwera kluczy\n"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wypisywania\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wypisywania\n"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr "wy�wietlanie ID zdj�� przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr "pokazywanie URL-i polityk przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 msgid "show all notations during signature verification"
 msgstr "pokazywanie wszystkich adnotacji przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr "pokazywanie standardowych adnotacji IETF przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr "pokazywanie adnotacji u�ytkownika przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "pokazywanie URL-i preferowanych serwer�w kluczy przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2668
 msgid "show user ID validity during signature verification"
 msgstr "pokazywanie poprawno�ci ID u�ytkownika przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2670
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "pokazywanie uniewa�nionych i wygas�ych ID u�ytkownika przy sprawdzaniu "
 "podpis�w"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2672
 msgid "show only the primary user ID in signature verification"
 msgstr "pokazywanie tylko g��wnego ID u�ytkownika przy sprawdzaniu podpisu"
 
-#: g10/gpg.c:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr "sprawdzanie podpis�w z danymi PKA"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "zwi�kszenie zaufania podpis�w z poprawnymi danymi PKA"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: niepoprawne opcje sprawdzania\n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje sprawdzania\n"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, 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:2889
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr "Niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w po��czeniu z %s!\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nie zadzia�a z niebezpieczn� pami�ci� z powodu %s\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3023
 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:3050
+#: g10/gpg.c:3029
 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:3056
+#: g10/gpg.c:3035
 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:3069
+#: g10/gpg.c:3048
 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:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm kompresji jest niepoprawny\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/gpg.c:3170
+#: g10/gpg.c:3149
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3151
 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:3174
+#: g10/gpg.c:3153
 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:3176
+#: g10/gpg.c:3155
 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:3179
+#: g10/gpg.c:3158
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/gpg.c:3183
+#: g10/gpg.c:3162
 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:3190
+#: g10/gpg.c:3169
 msgid "invalid default preferences\n"
 msgstr "niew�a�ciwe domy�lne ustawienia\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 msgid "invalid personal cipher preferences\n"
 msgstr "niew�a�ciwe ustawienia szyfr�w\n"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 msgid "invalid personal digest preferences\n"
 msgstr "niew�a�ciwe ustawienia skr�t�w\n"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 msgid "invalid personal compress preferences\n"
 msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie dzia�a z %s!\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, 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:3292
+#: g10/gpg.c:3271
 #, 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:3297
+#: g10/gpg.c:3276
 #, 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:3380
+#: g10/gpg.c:3359
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3391
+#: g10/gpg.c:3370
 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:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "szyfrowanie symetryczne ,,%s'' nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [plik]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nie mo�na u�y� --symmetric --encrypt wraz z --s2k-mode 0\n"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3428
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nie mo�na u�y� --symmetric --encrypt w trybie %s\n"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [plik]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nie mo�na u�y� --symmetric --sign --encrypt wraz z --s2k-mode 0\n"
 
-#: g10/gpg.c:3500
+#: g10/gpg.c:3479
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nie mo�na u�y� --symmetric --sign --encrypt w trybie %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3499
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3683
+#: g10/gpg.c:3662
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,,%s''\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4267
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:4321
+#: g10/gpg.c:4300
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany preferowany URL serwera kluczy jest niepoprawny\n"
 
@@ -2555,11 +2552,11 @@ msgstr "nie traktowa
 msgid "|FD|write status info to this FD"
 msgstr "|FD|pisanie opisu stanu do deskryptora FD"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpgv [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6785,39 +6782,48 @@ msgstr "|N|Nowy PIN"
 msgid "run in multi server mode (foreground)"
 msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
 
-#: scd/scdaemon.c:111
-msgid "read options from file"
-msgstr "odczyt opcji z pliku"
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr "|POZIOM|ustawienie POZIOMU diagnostyki"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
+#, fuzzy
+msgid "|FILE|write a log to FILE"
+msgstr "|PLIK|zapisanie log�w trybu serwerowego do PLIKu"
+
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr "|N|po��czenie z czytnikiem na porcie N"
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAZWA|u�ycie NAZWY jako sterownika ct-API"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAZWA|u�ycie NAZWY jako sterownika PC/SC"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 msgid "do not use the internal CCID driver"
 msgstr "nie u�ywanie wewn�trznego sterownika CCID"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr "nie u�ywanie klawiatury czytnika"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 msgid "allow the use of admin card commands"
 msgstr "zezwolenie na u�ycie polece� karty administratora"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Wywo�anie: scdaemon [opcje] (-h podaje pomoc)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6825,16 +6831,16 @@ msgstr ""
 "Sk�adnia: scdaemon [opcje] [polecenie [argumenty]]\n"
 "Demon kart procesorowych dla GnuPG\n"
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr "prosz� u�y� opcji ,,--daemon'' do uruchomienia programu w tle\n"
 
-#: scd/scdaemon.c:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "obs�uga fd %d uruchomiona\n"
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "obs�uga fd %d zako�czona\n"
@@ -7496,10 +7502,6 @@ msgstr "|NAZWA|u
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|u�ycie tego serwera do wyszukiwania kluczy"
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr "|POZIOM|ustawienie POZIOMU diagnostyki"
-
 #: sm/gpgsm.c:328
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|u�ycie tego algorytmu szyfrowania NAZWA"
@@ -7508,11 +7510,11 @@ msgstr "|NAZWA|u
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|u�ycie tego algorytmu skr�tu wiadomo�ci"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpgsm [opcje] [pliki] (-h podaje pomoc)"
 
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7523,59 +7525,59 @@ msgstr ""
 "MIME\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: sm/gpgsm.c:629
+#: sm/gpgsm.c:610
 msgid "usage: gpgsm [options] "
 msgstr "wywo�anie: gpgsm [opcje]"
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "UWAGA: nie mo�na zaszyfrowa� do ,,%s'': %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "nieznany model poprawno�ci ,,%s''\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "linia %d: nie podano nazwy przedmiotu\n"
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "  p = pomini�cie tego klucza\n"
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "niezrozumia�y URL serwera kluczy\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr "OSTRZE�ENIE: dzia�anie z fa�szywym czasem systemowym: "
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "import wsp�lnych certyfikat�w ,,%s''\n"
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nie mo�na podpisa� z u�yciem ,,%s'': %s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr "to polecenie nie zosta�o jeszcze zaimplementowane\n"
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7858,8 +7860,8 @@ msgstr "Opcje steruj
 msgid "Options useful for debugging"
 msgstr "Opcje przydatne do diagnostyki"
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|PLIK|zapisanie log�w trybu serwerowego do PLIKu"
 
@@ -8240,6 +8242,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "read options from file"
+#~ msgstr "odczyt opcji z pliku"
+
 #~ msgid "generate PGP 2.x compatible messages"
 #~ msgstr "generowanie wiadomo�ci zgodnych z PGP 2.x"
 
diff --git a/po/pt.po b/po/pt.po
index 3f13878ec..889c1337e 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -95,7 +95,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:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -105,12 +105,12 @@ msgstr "imposs
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -323,12 +323,13 @@ msgstr ""
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr ""
 
@@ -336,7 +337,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "procurar chaves num servidor de chaves"
@@ -393,165 +394,165 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: agent/gpg-agent.c:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, 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:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: agent/gpg-agent.c:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: agent/gpg-agent.c:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directoria criada\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, 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:1513
+#: agent/gpg-agent.c:1538
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: agent/gpg-agent.c:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1670
+#: agent/gpg-agent.c:1695
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1690
+#: agent/gpg-agent.c:1715
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1695
+#: agent/gpg-agent.c:1720
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: agent/gpg-agent.c:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignorado: %s\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 #, 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:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
 
-#: agent/gpg-agent.c:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -694,12 +695,12 @@ msgid ""
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 #, fuzzy
 msgid "Yes"
 msgstr "sim"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr ""
 
@@ -883,127 +884,127 @@ msgstr ""
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
-#: common/audit.c:684
+#: common/audit.c:692
 #, fuzzy
 msgid "Certificate chain available"
 msgstr "certificado incorrecto"
 
-#: common/audit.c:691
+#: common/audit.c:699
 #, fuzzy
 msgid "root certificate missing"
 msgstr "certificado incorrecto"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr ""
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 #, fuzzy
 msgid "Data available"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: common/audit.c:725
+#: common/audit.c:733
 #, fuzzy
 msgid "Session key created"
 msgstr "%s: porta-chaves criado\n"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, fuzzy, c-format
 msgid "algorithm: %s"
 msgstr "armadura: %s\n"
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: common/audit.c:736
+#: common/audit.c:744
 #, fuzzy
 msgid "seems to be not encrypted"
 msgstr "n�o cifrado"
 
-#: common/audit.c:742
+#: common/audit.c:750
 msgid "Number of recipients"
 msgstr ""
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr ""
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr ""
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr ""
 
-#: common/audit.c:823
+#: common/audit.c:831
 #, fuzzy
 msgid "Data verification succeeded"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: common/audit.c:832
+#: common/audit.c:840
 #, fuzzy
 msgid "Signature available"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: common/audit.c:837
+#: common/audit.c:845
 #, fuzzy
 msgid "Parsing signature succeeded"
 msgstr "Assinatura correcta de \""
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, fuzzy, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, fuzzy, c-format
 msgid "Signature %d"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: common/audit.c:873
+#: common/audit.c:881
 #, fuzzy
 msgid "Certificate chain valid"
 msgstr "Esta chave expirou!"
 
-#: common/audit.c:884
+#: common/audit.c:892
 #, fuzzy
 msgid "Root certificate trustworthy"
 msgstr "certificado incorrecto"
 
-#: common/audit.c:894
+#: common/audit.c:902
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "certificado incorrecto"
 
-#: common/audit.c:911
+#: common/audit.c:919
 #, fuzzy
 msgid "Included certificates"
 msgstr "certificado incorrecto"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 #, fuzzy
 msgid "Unknown operation"
 msgstr "vers�o desconhecida"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, fuzzy, c-format
 msgid "No help available for `%s'."
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
@@ -1457,7 +1458,7 @@ msgstr "Comando inv
 msgid "--output doesn't work for this command\n"
 msgstr "--output n�o funciona para este comando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
@@ -1990,15 +1991,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2008,7 +2009,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2016,563 +2017,559 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr "Chave p�blica: "
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr "Dispers�o: "
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 msgid "Compression: "
 msgstr "Compress�o: "
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr ""
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, 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:1345
+#: g10/gpg.c:1324
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1348
+#: g10/gpg.c:1327
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1351
+#: g10/gpg.c:1330
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1357
+#: g10/gpg.c:1336
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1360
+#: g10/gpg.c:1339
 #, 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:1363
+#: g10/gpg.c:1342
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1369
+#: g10/gpg.c:1348
 #, 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:1372
+#: g10/gpg.c:1351
 #, 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:1375
+#: g10/gpg.c:1354
 #, 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:1381
+#: g10/gpg.c:1360
 #, 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:1384
+#: g10/gpg.c:1363
 #, 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:1387
+#: g10/gpg.c:1366
 #, 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:1566
+#: g10/gpg.c:1545
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostrar em que porta-chave a chave est�"
 
-#: g10/gpg.c:1688
+#: g10/gpg.c:1667
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, 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:1940
+#: g10/gpg.c:1919
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, 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:2599
+#: g10/gpg.c:2578
 #, 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:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2613
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2616
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 msgid "invalid import options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 msgid "invalid export options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2670
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2672
 #, 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:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2683
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, 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:2889
+#: g10/gpg.c:2868
 #, 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:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, 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:3044
+#: g10/gpg.c:3023
 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:3050
+#: g10/gpg.c:3029
 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:3056
+#: g10/gpg.c:3035
 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:3069
+#: g10/gpg.c:3048
 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:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3170
+#: g10/gpg.c:3149
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3151
 #, 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:3174
+#: g10/gpg.c:3153
 #, 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:3176
+#: g10/gpg.c:3155
 #, 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:3179
+#: g10/gpg.c:3158
 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:3183
+#: g10/gpg.c:3162
 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:3190
+#: g10/gpg.c:3169
 msgid "invalid default preferences\n"
 msgstr "prefer�ncias por omiss�o inv�lidas\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 msgid "invalid personal cipher preferences\n"
 msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 msgid "invalid personal digest preferences\n"
 msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 msgid "invalid personal compress preferences\n"
 msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, 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:3292
+#: g10/gpg.c:3271
 #, 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:3297
+#: g10/gpg.c:3276
 #, 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:3380
+#: g10/gpg.c:3359
 #, 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:3391
+#: g10/gpg.c:3370
 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:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3428
 #, 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:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3500
+#: g10/gpg.c:3479
 #, 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:3520
+#: g10/gpg.c:3499
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3683
+#: g10/gpg.c:3662
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 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:4288
+#: g10/gpg.c:4267
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:4321
+#: g10/gpg.c:4300
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
@@ -2593,12 +2590,12 @@ msgstr ""
 "|DF|escrever informa��es de estado para o\n"
 "descritor de ficheiro DF"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6903,60 +6900,68 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111
-#, fuzzy
-msgid "read options from file"
-msgstr "a ler op��es de `%s'\n"
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
+#, fuzzy
+msgid "|FILE|write a log to FILE"
+msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
+
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "nunca usar o terminal"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "comandos em conflito\n"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7650,10 +7655,6 @@ msgstr "|NOME|usar NOME como chave secreta por omiss
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr ""
-
 #: sm/gpgsm.c:328
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
@@ -7662,12 +7663,12 @@ msgstr "|NOME|usar algoritmo de criptografia NOME"
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7678,60 +7679,60 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: sm/gpgsm.c:629
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [op��es] "
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "imposs�vel ligar a `%s': %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr ""
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = saltar esta chave\n"
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "imposs�vel fechar `%s': %s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8011,8 +8012,8 @@ msgstr ""
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
@@ -8400,6 +8401,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "read options from file"
+#~ msgstr "a ler op��es de `%s'\n"
+
 #~ msgid "|[file]|make a signature"
 #~ msgstr "|[ficheiro]|fazer uma assinatura"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 44e7289b1..0da81f7f6 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2007-08-16 11:35+0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -99,7 +99,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:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -109,12 +109,12 @@ msgstr "imposs
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -328,12 +328,13 @@ msgstr ""
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr ""
 
@@ -341,7 +342,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "exportar chaves para um servidor"
@@ -397,163 +398,163 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: agent/gpg-agent.c:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, 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:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, fuzzy, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
 
-#: agent/gpg-agent.c:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "Certificado de revoga��o v�lido"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: diret�rio criado\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, 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:1513
+#: agent/gpg-agent.c:1538
 #, 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:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1670
+#: agent/gpg-agent.c:1695
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1690
+#: agent/gpg-agent.c:1715
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1695
+#: agent/gpg-agent.c:1720
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: agent/gpg-agent.c:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves ignoradas\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -695,12 +696,12 @@ msgid ""
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 #, fuzzy
 msgid "Yes"
 msgstr "sim"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr ""
 
@@ -882,132 +883,132 @@ msgstr ""
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
-#: common/audit.c:684
+#: common/audit.c:692
 #, fuzzy
 msgid "Certificate chain available"
 msgstr "Certificado de revoga��o v�lido"
 
-#: common/audit.c:691
+#: common/audit.c:699
 #, fuzzy
 msgid "root certificate missing"
 msgstr ""
 "Nenhum certificado com confian�a indefinida encontrado.\n"
 "\n"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr ""
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 #, fuzzy
 msgid "Data available"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: common/audit.c:725
+#: common/audit.c:733
 #, fuzzy
 msgid "Session key created"
 msgstr "%s: chaveiro criado\n"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, fuzzy, c-format
 msgid "algorithm: %s"
 msgstr "armadura: %s\n"
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: common/audit.c:736
+#: common/audit.c:744
 #, fuzzy
 msgid "seems to be not encrypted"
 msgstr "n�o criptografado"
 
-#: common/audit.c:742
+#: common/audit.c:750
 msgid "Number of recipients"
 msgstr ""
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr ""
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr ""
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr ""
 
-#: common/audit.c:823
+#: common/audit.c:831
 #, fuzzy
 msgid "Data verification succeeded"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: common/audit.c:832
+#: common/audit.c:840
 #, fuzzy
 msgid "Signature available"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: common/audit.c:837
+#: common/audit.c:845
 #, fuzzy
 msgid "Parsing signature succeeded"
 msgstr "Assinatura correta de \""
 
 # "hash" poderia ser "espalhamento", mas n�o fica claro
-#: common/audit.c:842
+#: common/audit.c:850
 #, fuzzy, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, fuzzy, c-format
 msgid "Signature %d"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: common/audit.c:873
+#: common/audit.c:881
 #, fuzzy
 msgid "Certificate chain valid"
 msgstr "Certificado de revoga��o v�lido"
 
-#: common/audit.c:884
+#: common/audit.c:892
 #, fuzzy
 msgid "Root certificate trustworthy"
 msgstr ""
 "Nenhum certificado com confian�a indefinida encontrado.\n"
 "\n"
 
-#: common/audit.c:894
+#: common/audit.c:902
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "Certificado correto"
 
-#: common/audit.c:911
+#: common/audit.c:919
 #, fuzzy
 msgid "Included certificates"
 msgstr "Certificado inv�lido"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 #, fuzzy
 msgid "Unknown operation"
 msgstr "vers�o desconhecida"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, fuzzy, c-format
 msgid "No help available for `%s'."
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
@@ -1464,7 +1465,7 @@ msgstr "Comando inv
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
@@ -1997,15 +1998,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2015,7 +2016,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2023,573 +2024,569 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 #, fuzzy
 msgid "Compression: "
 msgstr "Coment�rio: "
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr ""
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1345
+#: g10/gpg.c:1324
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1348
+#: g10/gpg.c:1327
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1351
+#: g10/gpg.c:1330
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1357
+#: g10/gpg.c:1336
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1360
+#: g10/gpg.c:1339
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1363
+#: g10/gpg.c:1342
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1369
+#: g10/gpg.c:1348
 #, 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:1372
+#: g10/gpg.c:1351
 #, 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:1375
+#: g10/gpg.c:1354
 #, 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:1381
+#: g10/gpg.c:1360
 #, 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:1384
+#: g10/gpg.c:1363
 #, 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:1387
+#: g10/gpg.c:1366
 #, 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:1566
+#: g10/gpg.c:1545
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/gpg.c:1688
+#: g10/gpg.c:1667
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, 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:1940
+#: g10/gpg.c:1919
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, 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:2599
+#: g10/gpg.c:2578
 #, 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:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2613
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2616
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2670
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2672
 #, 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:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2683
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2868
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3023
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3029
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3056
+#: g10/gpg.c:3035
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:3069
+#: g10/gpg.c:3048
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3170
+#: g10/gpg.c:3149
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3151
 #, 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:3174
+#: g10/gpg.c:3153
 #, 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:3176
+#: g10/gpg.c:3155
 #, 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:3179
+#: g10/gpg.c:3158
 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:3183
+#: g10/gpg.c:3162
 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:3190
+#: g10/gpg.c:3169
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3271
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3276
 #, 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:3380
+#: g10/gpg.c:3359
 #, 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:3391
+#: g10/gpg.c:3370
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3428
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3500
+#: g10/gpg.c:3479
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3499
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3683
+#: g10/gpg.c:3662
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, 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:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4267
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4321
+#: g10/gpg.c:4300
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
@@ -2610,12 +2607,12 @@ msgstr ""
 "|DA|escrever informa��es de estado para o\n"
 "descritor de arquivo DA"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 #, fuzzy
 msgid ""
 "Syntax: gpg [options] [files]\n"
@@ -6910,60 +6907,68 @@ msgstr "Digite o identificador de usu
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111
-#, fuzzy
-msgid "read options from file"
-msgstr "lendo op��es de `%s'\n"
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
+#, fuzzy
+msgid "|FILE|write a log to FILE"
+msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
+
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "nunca usar o terminal"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "comandos conflitantes\n"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpgm [op��es] [arquivos] (-h para ajuda)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7662,10 +7667,6 @@ msgstr "|NOME|usar NOME como chave secreta padr
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr ""
-
 #: sm/gpgsm.c:328
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
@@ -7674,12 +7675,12 @@ msgstr "|NOME|usar algoritmo de criptografia NOME"
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpgm [op��es] [arquivos] (-h para ajuda)"
 
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7690,60 +7691,60 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: sm/gpgsm.c:629
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Uso: gpgm [op��es] "
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr ""
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8023,8 +8024,8 @@ msgstr ""
 msgid "Options useful for debugging"
 msgstr "habilitar depura��o completa"
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
@@ -8412,6 +8413,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "read options from file"
+#~ msgstr "lendo op��es de `%s'\n"
+
 #~ msgid "|[file]|make a signature"
 #~ msgstr "|[arquivo]|fazer uma assinatura"
 
diff --git a/po/ro.po b/po/ro.po
index 3096bd97c..15460bae3 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc1\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2005-05-31 22:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -98,7 +98,7 @@ msgstr "fraz
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritm rezumat %d nu este suportat\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -108,12 +108,12 @@ msgstr "nu pot crea `%s': %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nu pot deschide `%s': %s\n"
@@ -327,12 +327,13 @@ msgstr ""
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr ""
 
@@ -340,7 +341,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "caut� pentru chei pe un server de chei"
@@ -396,165 +397,165 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Raporta�i bug-uri la <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: agent/gpg-agent.c:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, 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:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "eroare la creearea `%s': %s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: agent/gpg-agent.c:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "eroare la ob�inere noului PIN: %s\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: agent/gpg-agent.c:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "director `%s' creat\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) a e�uat �n %s: %s\n"
 
-#: agent/gpg-agent.c:1513
+#: agent/gpg-agent.c:1538
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: nu pot crea director: %s\n"
 
-#: agent/gpg-agent.c:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1670
+#: agent/gpg-agent.c:1695
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1690
+#: agent/gpg-agent.c:1715
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1695
+#: agent/gpg-agent.c:1720
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "actualizarea secretului a e�uat: %s\n"
 
-#: agent/gpg-agent.c:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: s�rit�: %s\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: agent/gpg-agent.c:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
 
-#: agent/gpg-agent.c:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -700,12 +701,12 @@ msgid ""
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 #, fuzzy
 msgid "Yes"
 msgstr "da"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr ""
 
@@ -887,128 +888,128 @@ msgstr ""
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
-#: common/audit.c:684
+#: common/audit.c:692
 #, fuzzy
 msgid "Certificate chain available"
 msgstr "certificat incorect"
 
-#: common/audit.c:691
+#: common/audit.c:699
 #, fuzzy
 msgid "root certificate missing"
 msgstr "certificat incorect"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr ""
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 #, fuzzy
 msgid "Data available"
 msgstr "afi�eaz� toate datele disponibile"
 
-#: common/audit.c:725
+#: common/audit.c:733
 #, fuzzy
 msgid "Session key created"
 msgstr "%s: inelul de chei creat\n"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, fuzzy, c-format
 msgid "algorithm: %s"
 msgstr "validitate: %s"
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
 "\n"
 "Algoritmuri suportate:\n"
 
-#: common/audit.c:736
+#: common/audit.c:744
 #, fuzzy
 msgid "seems to be not encrypted"
 msgstr "necifrat"
 
-#: common/audit.c:742
+#: common/audit.c:750
 #, fuzzy
 msgid "Number of recipients"
 msgstr "Destinatari curen�i:\n"
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr ""
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr ""
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr ""
 
-#: common/audit.c:823
+#: common/audit.c:831
 #, fuzzy
 msgid "Data verification succeeded"
 msgstr "verificare semn�tur� eliminat�\n"
 
-#: common/audit.c:832
+#: common/audit.c:840
 #, fuzzy
 msgid "Signature available"
 msgstr "Semn�tur� f�cut� %s\n"
 
-#: common/audit.c:837
+#: common/audit.c:845
 #, fuzzy
 msgid "Parsing signature succeeded"
 msgstr "Semn�tur� bun� din \"%s\""
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, fuzzy, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, fuzzy, c-format
 msgid "Signature %d"
 msgstr "Semn�tur� f�cut� %s\n"
 
-#: common/audit.c:873
+#: common/audit.c:881
 #, fuzzy
 msgid "Certificate chain valid"
 msgstr "Aceast� cheie a expirat!"
 
-#: common/audit.c:884
+#: common/audit.c:892
 #, fuzzy
 msgid "Root certificate trustworthy"
 msgstr "certificat incorect"
 
-#: common/audit.c:894
+#: common/audit.c:902
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "certificat incorect"
 
-#: common/audit.c:911
+#: common/audit.c:919
 #, fuzzy
 msgid "Included certificates"
 msgstr "certificat incorect"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 #, fuzzy
 msgid "Unknown operation"
 msgstr "versiune necunoscut�"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, fuzzy, c-format
 msgid "No help available for `%s'."
 msgstr "Nici un disponibil disponibil pentru `%s'"
@@ -1434,7 +1435,7 @@ msgstr "Comand
 msgid "--output doesn't work for this command\n"
 msgstr "--output nu merge pentru aceast� comand�\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nu pot deschide `%s'\n"
@@ -1960,15 +1961,15 @@ msgstr ""
 " --list-keys [nume]         arat� chei\n"
 " --fingerprint [nume]       arat� amprente\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Raporta�i bug-uri la <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1978,7 +1979,7 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1986,81 +1987,77 @@ msgstr ""
 "\n"
 "Algoritmuri suportate:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr "Cifru: "
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 msgid "Compression: "
 msgstr "Compresie: "
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr ""
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "comenzi �n conflict\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, 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:1345
+#: g10/gpg.c:1324
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigur� (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1348
+#: g10/gpg.c:1327
 #, 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:1351
+#: g10/gpg.c:1330
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1357
+#: g10/gpg.c:1336
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1360
+#: g10/gpg.c:1339
 #, 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:1363
+#: g10/gpg.c:1342
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1369
+#: g10/gpg.c:1348
 #, 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:1372
+#: g10/gpg.c:1351
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2068,21 +2065,21 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1354
 #, 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:1381
+#: g10/gpg.c:1360
 #, 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:1384
+#: g10/gpg.c:1363
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2090,471 +2087,471 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1366
 #, 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:1566
+#: g10/gpg.c:1545
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 #, 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:1688
+#: g10/gpg.c:1667
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
 
-#: g10/gpg.c:1940
+#: g10/gpg.c:1919
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
 
-#: g10/gpg.c:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2599
+#: g10/gpg.c:2578
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nu este un set de carectere valid\n"
 
 #
-#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2613
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2616
 msgid "invalid keyserver options\n"
 msgstr "op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op�iuni import invalide\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 msgid "invalid import options\n"
 msgstr "op�iuni import invalide\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 msgid "invalid export options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 msgid "invalid list options\n"
 msgstr "op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2670
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2672
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 msgid "invalid verify options\n"
 msgstr "op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execu�ie ca %s\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2868
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, 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:3044
+#: g10/gpg.c:3023
 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:3050
+#: g10/gpg.c:3029
 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:3056
+#: g10/gpg.c:3035
 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:3069
+#: g10/gpg.c:3048
 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:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
 
-#: g10/gpg.c:3170
+#: g10/gpg.c:3149
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3151
 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:3174
+#: g10/gpg.c:3153
 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:3176
+#: g10/gpg.c:3155
 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:3179
+#: g10/gpg.c:3158
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
 
-#: g10/gpg.c:3183
+#: g10/gpg.c:3162
 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:3190
+#: g10/gpg.c:3169
 msgid "invalid default preferences\n"
 msgstr "preferin�e implicite invalide\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 msgid "invalid personal cipher preferences\n"
 msgstr "preferin�e cifrare personale invalide\n"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 msgid "invalid personal digest preferences\n"
 msgstr "preferin�e rezumat personale invalide\n"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 msgid "invalid personal compress preferences\n"
 msgstr "preferin�e compresie personale invalide\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge �nc� cu %s!\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, 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:3292
+#: g10/gpg.c:3271
 #, 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:3297
+#: g10/gpg.c:3276
 #, 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:3380
+#: g10/gpg.c:3359
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/gpg.c:3391
+#: g10/gpg.c:3370
 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:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [nume_fi�ier]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "cifrarea simetric� a lui `%s' a e�uat: %s\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 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:3449
+#: g10/gpg.c:3428
 #, 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:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [nume_fi�ier]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 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:3500
+#: g10/gpg.c:3479
 #, 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:3520
+#: g10/gpg.c:3499
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nume_fi�ier]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizator"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizator"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizator [comenzi]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recep�ie server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3683
+#: g10/gpg.c:3662
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie e�uat: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "c�utare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[nume_fi�ier]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4267
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
 
-#: g10/gpg.c:4321
+#: g10/gpg.c:4300
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
@@ -2571,11 +2568,11 @@ msgstr "d
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrie informa�ii de stare �n acest FD"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Folosire: gpgv [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6792,60 +6789,68 @@ msgstr "|N|PIN Nou"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111
-#, fuzzy
-msgid "read options from file"
-msgstr "citesc op�iuni din `%s'\n"
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
+#, fuzzy
+msgid "|FILE|write a log to FILE"
+msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
+
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NUME|folose�te NUME ca destinatar implicit"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NUME|folose�te NUME ca destinatar implicit"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "nu folosi deloc terminalul"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "arat� comenzi administrare"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7538,10 +7543,6 @@ msgstr "|NUME|folose
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|folose�te acest server de chei pentru a c�uta chei"
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr ""
-
 #: sm/gpgsm.c:328
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NUME|folose�te algoritm cifrare NUME"
@@ -7550,12 +7551,12 @@ msgstr "|NUME|folose
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NUME|folose�te algoritm rezumat mesaj NUME"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7566,61 +7567,61 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: sm/gpgsm.c:629
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "nu m� pot conecta la `%s': %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "op�iune necunoscut� `%s'\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Nici o descriere dat�)\n"
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "  s = s�ri peste cheia asta\n"
 
 #
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nu pot accesa `%s': %s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7898,8 +7899,8 @@ msgstr ""
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
@@ -8287,6 +8288,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "read options from file"
+#~ msgstr "citesc op�iuni din `%s'\n"
+
 #~ msgid "generate PGP 2.x compatible messages"
 #~ msgstr "genereaz� mesaje compatibile cu PGP 2.x"
 
diff --git a/po/ru.po b/po/ru.po
index 7f8735926..57dcfa0ba 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2006-11-07 19:31+0300\n"
 "Last-Translator: Maxim Britov <maxim.britov@gmail.com>\n"
 "Language-Team: Russian <gnupg-ru@gnupg.org>\n"
@@ -88,7 +88,7 @@ msgstr "Фраза-пароль"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "не поддерживаются ssh ключи превышающие %d бит\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -98,12 +98,12 @@ msgstr "не могу создать `%s': %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "не могу открыть `%s': %s\n"
@@ -310,11 +310,12 @@ msgstr "вывод результатов в sh-стиле"
 msgid "csh-style command output"
 msgstr "вывод результатов в csh-стиле"
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|взять параметры из FILE"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr "не отсоединяться от консоли"
 
@@ -322,7 +323,7 @@ msgstr "не отсоединяться от консоли"
 msgid "do not grab keyboard and mouse"
 msgstr "не перехватывать события мыши и клавиатуры"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "использовать файл журнала для сервера"
 
@@ -374,17 +375,17 @@ msgstr "разрешить эмуляцию ssh-агента"
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FILE|сохранить состояние в файл"
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "О найденных ошибках сообщайте <"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Использование: gpg-agent [параметры] (-h для подсказки)"
 
-#: agent/gpg-agent.c:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -392,146 +393,146 @@ msgstr ""
 "Синтаксис: gpg-agent [параметры] [команда [аргументы]]\n"
 "Управление закрытыми ключами для GnuPG\n"
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "запрошен недупустимый уровень отладки `%s'\n"
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, fuzzy, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "libksba слишком устаревшая (требуется %s, имеется %s)\n"
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
 
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл конфигурации `%s': %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "параметры конфигурации из файла `%s'\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "ошибка создания `%s': %s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "не могу создать каталог `%s': %s\n"
 
-#: agent/gpg-agent.c:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr "имя сокета слишком длинное\n"
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "не могу создать сокет: %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "имя сокета слишком длинное\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "нет gpg-agent доступого для данной сессии\n"
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "ошибка при получении нового PIN: %s\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "ошибка связывния сокета с `%s': %s\n"
 
-#: agent/gpg-agent.c:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "слушаем сокет `%s'\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "создан каталог `%s'\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1513
+#: agent/gpg-agent.c:1538
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "невозможно использовать `%s' как домашний каталог\n"
 
-#: agent/gpg-agent.c:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "ошибка чтения из %s: %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1670
+#: agent/gpg-agent.c:1695
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1690
+#: agent/gpg-agent.c:1715
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1695
+#: agent/gpg-agent.c:1720
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s: остановлен\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 msgid "no gpg-agent running in this session\n"
 msgstr "нет gpg-agent доступого для данной сессии\n"
 
-#: agent/gpg-agent.c:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -679,11 +680,11 @@ msgstr ""
 "Действительно абсолютно доверять%%0A  \"%s\"%%0Aкорректно подписанным "
 "сертификатам пользователя?"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 msgid "Yes"
 msgstr "Да"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr "Нет"
 
@@ -861,128 +862,128 @@ msgstr "нет работающих gpg-agent - запускаем\n"
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "невозможно подключиться к агенту - пробуем откатиться назад\n"
 
-#: common/audit.c:684
+#: common/audit.c:692
 #, fuzzy
 msgid "Certificate chain available"
 msgstr "цепочка сертификации слишком длинная\n"
 
-#: common/audit.c:691
+#: common/audit.c:699
 #, fuzzy
 msgid "root certificate missing"
 msgstr "корневой сертификат не помечен доверяемым"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr ""
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 #, fuzzy
 msgid "Data available"
 msgstr "вывести все доступные данные"
 
-#: common/audit.c:725
+#: common/audit.c:733
 #, fuzzy
 msgid "Session key created"
 msgstr "%s: таблица ключей создана\n"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, fuzzy, c-format
 msgid "algorithm: %s"
 msgstr "достоверность: %s"
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
 "\n"
 "Поддерживаются следующие алгоритмы:\n"
 
-#: common/audit.c:736
+#: common/audit.c:744
 #, fuzzy
 msgid "seems to be not encrypted"
 msgstr "(это не похоже не зашифрованное сообщение)\n"
 
-#: common/audit.c:742
+#: common/audit.c:750
 #, fuzzy
 msgid "Number of recipients"
 msgstr "Текущие получатели:\n"
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr ""
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr ""
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr ""
 
-#: common/audit.c:823
+#: common/audit.c:831
 #, fuzzy
 msgid "Data verification succeeded"
 msgstr "проверка подписи подавлена\n"
 
-#: common/audit.c:832
+#: common/audit.c:840
 #, fuzzy
 msgid "Signature available"
 msgstr "Подпись сделана"
 
-#: common/audit.c:837
+#: common/audit.c:845
 #, fuzzy
 msgid "Parsing signature succeeded"
 msgstr "подпись не найдена\n"
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, fuzzy, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, fuzzy, c-format
 msgid "Signature %d"
 msgstr "Подпись сделана"
 
-#: common/audit.c:873
+#: common/audit.c:881
 #, fuzzy
 msgid "Certificate chain valid"
 msgstr "сертификат еще не достоверен"
 
-#: common/audit.c:884
+#: common/audit.c:892
 #, fuzzy
 msgid "Root certificate trustworthy"
 msgstr "корневой сертификат не помечен доверяемым"
 
-#: common/audit.c:894
+#: common/audit.c:902
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "не найдена CRL для сертификата"
 
-#: common/audit.c:911
+#: common/audit.c:919
 #, fuzzy
 msgid "Included certificates"
 msgstr "экспорт сертификатов"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 #, fuzzy
 msgid "Unknown operation"
 msgstr "неизвестный параметр `%s'\n"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, fuzzy, c-format
 msgid "No help available for `%s'."
 msgstr "Нет справки для `%s'"
@@ -1407,7 +1408,7 @@ msgstr "Недопустимая команда  (список команд: \"h
 msgid "--output doesn't work for this command\n"
 msgstr "--output не работает для данной команды\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "не могу открыть `%s'\n"
@@ -1924,15 +1925,15 @@ msgstr ""
 " --list-keys [имена]        показать ключи\n"
 " --fingerprint [имена]      показать отпечатки\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "О найденных ошибка сообщайте <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
 
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1942,7 +1943,7 @@ msgstr ""
 "Подписи и их проверка, зашифрование и расшифрование\n"
 "действие по умолчанию зависит от входных данных\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1950,96 +1951,92 @@ msgstr ""
 "\n"
 "Поддерживаются следующие алгоритмы:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr "С открытым ключом: "
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr "Симметричные шифры: "
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr "Хэш-функции: "
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 msgid "Compression: "
 msgstr "Алгоритмы сжатия: "
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr ""
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "использование: gpg [параметры] "
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "несовместимые команды\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "отсутствует знак = в определении группы `%s'\n"
 
-#: g10/gpg.c:1345
+#: g10/gpg.c:1324
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец домашнего каталога `%s'\n"
 
-#: g10/gpg.c:1348
+#: g10/gpg.c:1327
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла конфигурации `%s'\n"
 
-#: g10/gpg.c:1351
+#: g10/gpg.c:1330
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла модуля расширения `%s'\n"
 
-#: g10/gpg.c:1357
+#: g10/gpg.c:1336
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа у домашнего каталога `%s'\n"
 
-#: g10/gpg.c:1360
+#: g10/gpg.c:1339
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа у файла конфигурации `%s'\n"
 
-#: g10/gpg.c:1363
+#: g10/gpg.c:1342
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа у файла модуля расширения `%s'\n"
 
-#: g10/gpg.c:1369
+#: g10/gpg.c:1348
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего домашний каталог `%s'\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1351
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего файл конфигурации `%s'\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1354
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего модуль расширения `%s'\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1360
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа у каталога содержащего домашний каталог "
 "`%s'\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1363
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2047,461 +2044,461 @@ msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа у каталога содержащего файл "
 "конфигурации `%s'\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1366
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа у каталогу содержащего файл модуля "
 "расширения `%s'\n"
 
-#: g10/gpg.c:1566
+#: g10/gpg.c:1545
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "неизвестный параметр в файле конфигурации `%s'\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr "отображать Фото ID при распечатке ключей"
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr "показывать ссылку на политики при распечатке подписей"
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 msgid "show all notations during signature listings"
 msgstr "показывать все примечания в списке подписей"
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 "показывать добавленные пользователем примечания при распечатке подписей"
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "показываеть предпочитаемый сервер ключей с списке подписей"
 
-#: g10/gpg.c:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr "показывать действительность Used ID при распечатке ключей"
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr "показывать отозванные и просроченные User ID при распечатке ключей"
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr "показывать отозванные и просроченные ключи при распечатке списка"
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 msgid "show the keyring name in key listings"
 msgstr "печатать имя таблиц ключей в списке ключей"
 
-#: g10/gpg.c:1688
+#: g10/gpg.c:1667
 msgid "show expiration dates during signature listings"
 msgstr "печатать даты истечения в списке подписей"
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "ЗАМЕЧАНИЕ: старый файл конфигурации по умолчанию `%s' проигнорирован\n"
 
-#: g10/gpg.c:1940
+#: g10/gpg.c:1919
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libcrypt слишком старой версии (требуется %s, обнаружено %s)\n"
 
-#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ЗАМЕЧАНИЕ: %s не предназначен для обычного применения!\n"
 
-#: g10/gpg.c:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2599
+#: g10/gpg.c:2578
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' недопустимая таблица символов\n"
 
-#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 msgid "could not parse keyserver URL\n"
 msgstr "не могу проанализировать URL сервера ключей\n"
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2613
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2616
 msgid "invalid keyserver options\n"
 msgstr "недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопустимый список параметров\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 msgid "invalid list options\n"
 msgstr "недопустимый список параметров\n"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr "показывать Фото ID при проверке подписи"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr "показывать ссылку на политики при проверке подписи"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 msgid "show all notations during signature verification"
 msgstr "показывать все примечания в процессе проверки подписей"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr "показывать добавленные пользователем примечания при проверке подписей"
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "печатать предпочитаемые серверы ключей при проверке подписей"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2668
 msgid "show user ID validity during signature verification"
 msgstr "печатать действительность UserID при проверке подписей"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2670
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "показывать отозванные и просроченные User ID при проверке подписей"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2672
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "показывать отозванные и просроченные User ID при проверке подписей"
 
-#: g10/gpg.c:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопустимые параметры проверки \n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 msgid "invalid verify options\n"
 msgstr "недопустимые параметры проверки\n"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr "недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти программы!\n"
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ВНИМАНИЕ: %s заместит %s\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не допускается использовать с %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s не имеет смысла совместно с %s!\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не будет работать с небезопасной памятью из-за %s\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3023
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3029
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Нельзя одновременно подписать и зашифровать в режиме --pgp2\n"
 
-#: g10/gpg.c:3056
+#: g10/gpg.c:3035
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Следует использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
 
-#: g10/gpg.c:3069
+#: g10/gpg.c:3048
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифрования сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран неверный алгоритм сжатия\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция для сертификации\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/gpg.c:3170
+#: g10/gpg.c:3149
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3151
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
 
-#: g10/gpg.c:3174
+#: g10/gpg.c:3153
 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:3176
+#: g10/gpg.c:3155
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3158
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ЗАМЕЧАНИЕ: простой режим S2K (0) строго не рекомендуется\n"
 
-#: g10/gpg.c:3183
+#: g10/gpg.c:3162
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/gpg.c:3190
+#: g10/gpg.c:3169
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые персональные предпочтения шифра\n"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые персональные предпочтения хэш-функции\n"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s пока не работает совместно с %s\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать шифрование `%s' в режиме %s\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3271
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать хэш-функцию `%s' в режиме %s\n"
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3276
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать сжатие `%s' в режиме %s\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3359
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/gpg.c:3391
+#: g10/gpg.c:3370
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [файл]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [файл]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "симметричное шифрование `%s' не удалось: %s\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [файл]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [файл]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "нельзя использовать --symmetric --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3428
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [файл]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [файл]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [файл]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3500
+#: g10/gpg.c:3479
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --sign --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3499
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [файл]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [файл]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [файл]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [команды]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "сбой при отправке на сервер ключей: %s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "сбой при получении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3683
+#: g10/gpg.c:3662
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "сбой при экспорте ключа: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "сбой при поиске на сервере ключей: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "сбой при обновлении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из ASCII формата: %s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[файл]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "Набирайте Ваше сообщение ...\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL политики сертификации неверен\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4267
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL политики подписи неверен\n"
 
-#: g10/gpg.c:4321
+#: g10/gpg.c:4300
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
@@ -2518,11 +2515,11 @@ msgstr "при несоответствии отметки времени - то
 msgid "|FD|write status info to this FD"
 msgstr "|FD|выводить инфромацию в файл с дескриптором FD"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Использовать: gpgv [параметры] [файлы] (-h для подсказки)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6691,39 +6688,48 @@ msgstr "|N|Новый PIN"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111
-msgid "read options from file"
-msgstr "получение параметров конфигурации из файла"
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr "|LEVEL|установить уровень отладки в LEVEL"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
+#, fuzzy
+msgid "|FILE|write a log to FILE"
+msgstr "|FILE|сохранять журнал режима сервера в FILE"
+
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 msgid "allow the use of admin card commands"
 msgstr "позволить использовать управляющие команды"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Использование: scdaemon [параметры] (-h для подсказки)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6731,17 +6737,17 @@ msgstr ""
 "Синтаксис: scdaemon [параметры] [команда [аргументы]]\n"
 "Демон смарткарт для GnuPG\n"
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 "Используйте параметр `--daemon' для запуска приложения в фоновом режиме\n"
 
-#: scd/scdaemon.c:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "обработчик fd %d запущен\n"
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "обработчик fd %d остановлен\n"
@@ -7413,10 +7419,6 @@ msgstr "|NAME|использовать NAME как секретный ключ 
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|использовать данный сервер ключей для поиска ключей"
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr "|LEVEL|установить уровень отладки в LEVEL"
-
 #: sm/gpgsm.c:328
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|использовать алгоритм шифрования NAME"
@@ -7425,11 +7427,11 @@ msgstr "|NAME|использовать алгоритм шифрования NAM
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|использовать хеш-функцию NAME"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Использование: gpgsm [параметры] [файлы] (-h для подсказки)"
 
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7440,59 +7442,59 @@ msgstr ""
 "протокол\n"
 "операция по умолчанию зависит от входных данных\n"
 
-#: sm/gpgsm.c:629
+#: sm/gpgsm.c:610
 msgid "usage: gpgsm [options] "
 msgstr "использование: gpgsm [параметры] "
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "не могу зашифровать для `%s': %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "неизвестный параметр `%s'\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Пояснения отсутствуют)\n"
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = пропустить этот ключ\n"
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "не могу проанализировать URL сервера ключей\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr "ВНИМАНИЕ: выполняемся с подделанным системным временем: "
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "невозможно подписать используя `%s': %s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr "данная команды всё еще не реализована\n"
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7767,8 +7769,8 @@ msgstr "Параметры контролирующие конфигурацию
 msgid "Options useful for debugging"
 msgstr "Параметры полезные для отладки"
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|сохранять журнал режима сервера в FILE"
 
@@ -8155,6 +8157,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "read options from file"
+#~ msgstr "получение параметров конфигурации из файла"
+
 #~ msgid "generate PGP 2.x compatible messages"
 #~ msgstr "создает сообщение совместимым с PGP 2.x"
 
diff --git a/po/sk.po b/po/sk.po
index 33c1b8570..abacc3095 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <mmajer@econ.umb.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -91,7 +91,7 @@ msgstr "nespr
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -101,12 +101,12 @@ msgstr "nem
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
@@ -319,12 +319,13 @@ msgstr ""
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr ""
 
@@ -332,7 +333,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "vyh�ada� k���e na serveri k���ov"
@@ -388,8 +389,8 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
@@ -397,158 +398,158 @@ msgstr ""
 "Chyby ozn�mte, pros�m, na adresu <gnupg-bugs@gnu.org>.\n"
 "Pripomienky k prekladu <sk-i18n@lists.linux.sk>.\n"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: agent/gpg-agent.c:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, 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:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "chyba pri vytv�ran� `%s': %s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nem��em vytvori� adres�r `%s': %s\n"
 
-#: agent/gpg-agent.c:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "chyba pri posielan� na `%s': %s\n"
 
-#: agent/gpg-agent.c:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: adres�r vytvoren�\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, 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:1513
+#: agent/gpg-agent.c:1538
 #, 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:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1670
+#: agent/gpg-agent.c:1695
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1690
+#: agent/gpg-agent.c:1715
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1695
+#: agent/gpg-agent.c:1720
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, 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:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: presko�en�: %s\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: agent/gpg-agent.c:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "zl� form�t premennej prostredia GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -691,12 +692,12 @@ msgid ""
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 #, fuzzy
 msgid "Yes"
 msgstr "ano"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr ""
 
@@ -879,127 +880,127 @@ msgstr ""
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
-#: common/audit.c:684
+#: common/audit.c:692
 #, fuzzy
 msgid "Certificate chain available"
 msgstr "nespr�vny certifik�t"
 
-#: common/audit.c:691
+#: common/audit.c:699
 #, fuzzy
 msgid "root certificate missing"
 msgstr "nespr�vny certifik�t"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr ""
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 #, fuzzy
 msgid "Data available"
 msgstr "K��� k dispoz�cii na: "
 
-#: common/audit.c:725
+#: common/audit.c:733
 #, fuzzy
 msgid "Session key created"
 msgstr "%s: s�bor k���ov (keyring) vytvoren�\n"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, fuzzy, c-format
 msgid "algorithm: %s"
 msgstr "ASCII k�dovanie: %s\n"
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: common/audit.c:736
+#: common/audit.c:744
 #, fuzzy
 msgid "seems to be not encrypted"
 msgstr "neza�ifrovan�"
 
-#: common/audit.c:742
+#: common/audit.c:750
 msgid "Number of recipients"
 msgstr ""
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr ""
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr ""
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr ""
 
-#: common/audit.c:823
+#: common/audit.c:831
 #, fuzzy
 msgid "Data verification succeeded"
 msgstr "verifik�cia podpisu potla�en�\n"
 
-#: common/audit.c:832
+#: common/audit.c:840
 #, fuzzy
 msgid "Signature available"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: common/audit.c:837
+#: common/audit.c:845
 #, fuzzy
 msgid "Parsing signature succeeded"
 msgstr "Dobr� podpis od \""
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, fuzzy, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, fuzzy, c-format
 msgid "Signature %d"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: common/audit.c:873
+#: common/audit.c:881
 #, fuzzy
 msgid "Certificate chain valid"
 msgstr "Platnos� k���a vypr�ala!"
 
-#: common/audit.c:884
+#: common/audit.c:892
 #, fuzzy
 msgid "Root certificate trustworthy"
 msgstr "nespr�vny certifik�t"
 
-#: common/audit.c:894
+#: common/audit.c:902
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "nespr�vny certifik�t"
 
-#: common/audit.c:911
+#: common/audit.c:919
 #, fuzzy
 msgid "Included certificates"
 msgstr "nespr�vny certifik�t"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 #, fuzzy
 msgid "Unknown operation"
 msgstr "nezn�ma verzia"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, fuzzy, c-format
 msgid "No help available for `%s'."
 msgstr "Pomoc nie je dostupn� pre '%s'"
@@ -1453,7 +1454,7 @@ msgstr "Neplatn
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento pr�kaz nefunguje\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nemo�no otvori� `%s'\n"
@@ -1990,17 +1991,17 @@ msgstr ""
 " --list-keys [men�]        vyp�sa� k���e\n"
 " --fingerprint [men�]      vyp�sa� fingerprinty\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Chyby ozn�mte, pros�m, na adresu <gnupg-bugs@gnu.org>.\n"
 "Pripomienky k prekladu <sk-i18n@lists.linux.sk>.\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -2010,7 +2011,7 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2018,569 +2019,565 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr "Verejn� k���e: "
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr "�ifry: "
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 msgid "Compression: "
 msgstr "Kompresia: "
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr ""
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, 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:1345
+#: g10/gpg.c:1324
 #, 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:1348
+#: g10/gpg.c:1327
 #, 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:1351
+#: g10/gpg.c:1330
 #, 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:1357
+#: g10/gpg.c:1336
 #, 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:1360
+#: g10/gpg.c:1339
 #, 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:1363
+#: g10/gpg.c:1342
 #, 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:1369
+#: g10/gpg.c:1348
 #, 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:1372
+#: g10/gpg.c:1351
 #, 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:1375
+#: g10/gpg.c:1354
 #, 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:1381
+#: g10/gpg.c:1360
 #, 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:1384
+#: g10/gpg.c:1363
 #, 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:1387
+#: g10/gpg.c:1366
 #, 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:1566
+#: g10/gpg.c:1545
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 #, 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:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "uk� v ktorom s�bore k���ov je vyp�san� k���"
 
-#: g10/gpg.c:1688
+#: g10/gpg.c:1667
 #, 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:1849
+#: g10/gpg.c:1828
 #, 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:1940
+#: g10/gpg.c:1919
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, 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:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2599
+#: g10/gpg.c:2578
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 #, 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:2634
+#: g10/gpg.c:2613
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2616
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 msgid "invalid import options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 msgid "invalid export options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2670
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2672
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2683
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2868
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prep��e %s\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�va s %s zmysel!\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3023
 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:3050
+#: g10/gpg.c:3029
 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:3056
+#: g10/gpg.c:3035
 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:3069
+#: g10/gpg.c:3048
 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:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
 
-#: g10/gpg.c:3170
+#: g10/gpg.c:3149
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3151
 #, 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:3174
+#: g10/gpg.c:3153
 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:3176
+#: g10/gpg.c:3155
 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:3179
+#: g10/gpg.c:3158
 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:3183
+#: g10/gpg.c:3162
 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:3190
+#: g10/gpg.c:3169
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� predvo�by\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s e�te nepracuje s %s\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, 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:3292
+#: g10/gpg.c:3271
 #, 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:3297
+#: g10/gpg.c:3276
 #, 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:3380
+#: g10/gpg.c:3359
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/gpg.c:3391
+#: g10/gpg.c:3370
 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:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [meno s�boru]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno s�boru]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno s�boru]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3428
 #, 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:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [meno s�boru]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3500
+#: g10/gpg.c:3479
 #, 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:3520
+#: g10/gpg.c:3499
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno s�boru]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno s�boru]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno s�boru]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u��vate�a"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u��vate�a [pr�kazy]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/gpg.c:3683
+#: g10/gpg.c:3662
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export k���a: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa n�js� server: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualiz�cia servera zlyhala: %s\n"
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[meno s�boru]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite p�sa� svoju spr�vu ...\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4267
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:4321
+#: g10/gpg.c:4300
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
@@ -2598,11 +2595,11 @@ msgstr "konflikt 
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zap�sa� inform�cie o stave do tohto FD"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pou�itie: gpgv [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6912,60 +6909,68 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111
-#, fuzzy
-msgid "read options from file"
-msgstr "��tam mo�nosti z `%s'\n"
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
+#, fuzzy
+msgid "|FILE|write a log to FILE"
+msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
+
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "v�bec nepou��va� termin�l"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "konfliktn� pr�kazy\n"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7658,10 +7663,6 @@ msgstr ""
 "|PO��TA�|pou�i tento server k���ov na vyh�ad�vanie\n"
 " k���ov"
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr ""
-
 #: sm/gpgsm.c:328
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ALG|pou�i� �ifrovac� algoritmus ALG"
@@ -7670,12 +7671,12 @@ msgstr "|ALG|pou
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|ALG|pou�i� hashovac� algoritmus ALG"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7686,60 +7687,60 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: sm/gpgsm.c:629
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "nem��em sa pripoji� k `%s': %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(�iadny popis)\n"
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = presko�i� tento k���\n"
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nem��em zavrie� `%s': %s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8019,8 +8020,8 @@ msgstr ""
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
@@ -8407,6 +8408,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "read options from file"
+#~ msgstr "��tam mo�nosti z `%s'\n"
+
 #~ msgid "|[file]|make a signature"
 #~ msgstr "|[s�bor]|vytvori� podpis"
 
diff --git a/po/sv.po b/po/sv.po
index e9781f527..943f9dde2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg trunk\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2008-07-21 09:04+0200\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -115,7 +115,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:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -125,12 +125,12 @@ msgstr "kan inte skapa \"%s\": %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
@@ -349,11 +349,12 @@ msgstr "sh-liknande kommandoutdata"
 msgid "csh-style command output"
 msgstr "csh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|läs inställningar från FIL"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr "frigör inte från konsollen"
 
@@ -361,7 +362,7 @@ msgstr "frigör inte från konsollen"
 msgid "do not grab keyboard and mouse"
 msgstr "fånga inte tangentbord och mus"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "använd en loggfil för servern"
 
@@ -414,17 +415,17 @@ msgstr "aktivera ssh-agent-emulering"
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FIL|skriv miljöinställningar även till FIL"
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "Rapportera fel till <"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Användning: gpg-agent [flaggor] (-h för hjälp)"
 
-#: agent/gpg-agent.c:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -432,145 +433,145 @@ msgstr ""
 "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
 "Hantering av hemliga nycklar för GnuPG\n"
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ogiltig debug-level \"%s\" angiven\n"
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s är för gammal (behöver %s, har %s)\n"
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBS: inställningsfilen \"%s\" saknas\n"
 
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Fel när \"%s\" skapades: %s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan inte skapa katalog: %s\n"
 
-#: agent/gpg-agent.c:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr "namnet på uttaget är för långt\n"
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan inte skapa uttag: %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "namnet på uttaget \"%s\" är för långt\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "en gpg-agent är redan igång - startar inte en till\n"
 
 # Jag har valt att inte översätta nonce. Nonce är data eller information som endast används en gång
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 msgid "error getting nonce for the socket\n"
 msgstr "fel vid hämtning av nonce för uttaget\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "fel när \"%s\" bands till uttag: %s\n"
 
-#: agent/gpg-agent.c:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() misslyckades: %s\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "lyssnar på uttaget \"%s\"\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen \"%s\" skapades\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() misslyckades för \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1513
+#: agent/gpg-agent.c:1538
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "kan inte använda \"%s\" som hemkatalog\n"
 
-#: agent/gpg-agent.c:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "fel vid läsning av nonce på fd %d: %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, 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:1670
+#: agent/gpg-agent.c:1695
 #, 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:1690
+#: agent/gpg-agent.c:1715
 #, 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:1695
+#: agent/gpg-agent.c:1720
 #, 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:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select misslyckades: %s - väntar 1 s\n"
 
-#: agent/gpg-agent.c:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppad\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 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:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
 
-#: agent/gpg-agent.c:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -719,11 +720,11 @@ msgstr ""
 "Litar du förbehållslöst på%%0A  \"%s\"%%0Aatt korrekt certifiera "
 "användarcertifikat?"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr "Nej"
 
@@ -906,112 +907,112 @@ msgstr "ingen körande gpg-agent - startar en\n"
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "kan inte ansluta till agenten - försöker falla tillbaka\n"
 
-#: common/audit.c:684
+#: common/audit.c:692
 msgid "Certificate chain available"
 msgstr "Certifikatkedja tillgänglig"
 
-#: common/audit.c:691
+#: common/audit.c:699
 msgid "root certificate missing"
 msgstr "rotcertifikatet saknas"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr "Datakryptering lyckades"
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 msgid "Data available"
 msgstr "Data tillgängligt"
 
-#: common/audit.c:725
+#: common/audit.c:733
 msgid "Session key created"
 msgstr "Sessionsnyckel skapad"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, c-format
 msgid "algorithm: %s"
 msgstr "algoritm: %s"
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "algoritmen stöds inte: %s"
 
-#: common/audit.c:736
+#: common/audit.c:744
 msgid "seems to be not encrypted"
 msgstr "verkar inte vara krypterat"
 
-#: common/audit.c:742
+#: common/audit.c:750
 msgid "Number of recipients"
 msgstr "Antal mottagare"
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr "Mottagare %d"
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr "Datasignering lyckades"
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr "Datadekryptering lyckades"
 
-#: common/audit.c:823
+#: common/audit.c:831
 msgid "Data verification succeeded"
 msgstr "Datavalidering lyckades"
 
-#: common/audit.c:832
+#: common/audit.c:840
 msgid "Signature available"
 msgstr "Signatur tillgänglig"
 
-#: common/audit.c:837
+#: common/audit.c:845
 msgid "Parsing signature succeeded"
 msgstr "Tolkning av signatur lyckades"
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "Felaktig hashalgoritm: %s"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, c-format
 msgid "Signature %d"
 msgstr "Signatur %d"
 
-#: common/audit.c:873
+#: common/audit.c:881
 msgid "Certificate chain valid"
 msgstr "Certifikatkedjan är giltig"
 
-#: common/audit.c:884
+#: common/audit.c:892
 msgid "Root certificate trustworthy"
 msgstr "rotcertifikatet är pålitligt"
 
-#: common/audit.c:894
+#: common/audit.c:902
 msgid "CRL/OCSP check of certificates"
 msgstr "CRL/OCSP-kontroll av certifikat"
 
-#: common/audit.c:911
+#: common/audit.c:919
 msgid "Included certificates"
 msgstr "Inkluderade certifikat"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr "Inga poster i granskningslogg."
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 msgid "Unknown operation"
 msgstr "Okänd åtgärd"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent användbar"
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr "Dirmngr användbar"
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, c-format
 msgid "No help available for `%s'."
 msgstr "Det finns ingen hjälp tillgänglig för \"%s\"."
@@ -1442,7 +1443,7 @@ msgid "--output doesn't work for this command\n"
 msgstr "--output kan inte användas för detta kommando\n"
 
 # se förra kommentaren
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
@@ -1967,18 +1968,18 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Rapportera fel till <gnupg-bugs@gnu.org>\n"
 "Skicka synpunkter på översättningen till <tp-sv@listor.tp-sv.se>\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
 # Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1988,7 +1989,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1996,78 +1997,74 @@ msgstr ""
 "\n"
 "Algoritmer som stöds:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr "Publik nyckel: "
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr "Chiffer: "
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr "Använda bibliotek:"
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
 # Vad betyder detta?
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
 
-#: g10/gpg.c:1345
+#: g10/gpg.c:1324
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VARNING: osäkert ägarskap på hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1348
+#: g10/gpg.c:1327
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VARNING: osäkert ägarskap på konfigurationsfilen \"%s\"\n"
 
-#: g10/gpg.c:1351
+#: g10/gpg.c:1330
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VARNING: osäkert ägarskap på tillägget \"%s\"\n"
 
-#: g10/gpg.c:1357
+#: g10/gpg.c:1336
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VARNING: osäkra rättigheter på hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1360
+#: g10/gpg.c:1339
 #, 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:1363
+#: g10/gpg.c:1342
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VARNING: osäkra rättigheter på tillägget \"%s\"\n"
 
-#: g10/gpg.c:1369
+#: g10/gpg.c:1348
 #, 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:1372
+#: g10/gpg.c:1351
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2075,19 +2072,19 @@ msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen \"%"
 "s\"\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1354
 #, 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:1381
+#: g10/gpg.c:1360
 #, 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:1384
+#: g10/gpg.c:1363
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2095,470 +2092,470 @@ msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen "
 "\"%s\"\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1366
 #, 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:1566
+#: g10/gpg.c:1545
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "okänd konfigurationspost \"%s\"\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr "visa foto-id under nyckellistning"
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr "visa policy-url:er under signaturlistningar"
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 msgid "show all notations during signature listings"
 msgstr "visa alla notationer under signaturlistningar"
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr "visa IETF-standardnotationer under signaturlistningar"
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr "visa användarangivna notationer under signaturlistningar"
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "visa url:er till föredragna nyckelservrar under signaturlistningar"
 
-#: g10/gpg.c:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr "visa giltighet för användaridentitet vid nyckellistningar "
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 msgid "show the keyring name in key listings"
 msgstr "visa nyckelringens namn i nyckellistningar"
 
-#: g10/gpg.c:1688
+#: g10/gpg.c:1667
 msgid "show expiration dates during signature listings"
 msgstr "visa utgångsdatum under signaturlistningar"
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, 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:1940
+#: g10/gpg.c:1919
 #, 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:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, 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:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, 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:2599
+#: g10/gpg.c:2578
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "\"%s\" är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka url till nyckelserver\n"
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2613
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2616
 msgid "invalid keyserver options\n"
 msgstr "ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ogiltiga importeringsflaggor\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 msgid "invalid import options\n"
 msgstr "ogiltiga importflaggor\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ogiltiga exportflaggor\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 msgid "invalid export options\n"
 msgstr "ogiltiga exportinställningar\n"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ogiltiga listflaggor\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 msgid "invalid list options\n"
 msgstr "ogiltiga listflaggor\n"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr "visa foto-id under signaturvalidering"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr "visa policy-url:er under signaturvalidering"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 msgid "show all notations during signature verification"
 msgstr "visa alla notationer under signaturvalidering"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr "visa IETF-standardnotationer under signaturvalidering"
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr "visa användarangivna notationer under signaturvalidering"
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2668
 msgid "show user ID validity during signature verification"
 msgstr "visa giltighet för användaridentitet vid signaturvalidering"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2670
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2672
 msgid "show only the primary user ID in signature verification"
 msgstr "visa endast primär användaridentitet i signaturvalidering"
 
-#: g10/gpg.c:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr "validera signaturer med PKA-data"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "öka tillit på signaturer med giltigt PKA-data"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 msgid "invalid verify options\n"
 msgstr "ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, 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:2889
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2871
 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:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, 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:3030
+#: g10/gpg.c:3009
 #, 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:3044
+#: g10/gpg.c:3023
 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:3050
+#: g10/gpg.c:3029
 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:3056
+#: g10/gpg.c:3035
 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:3069
+#: g10/gpg.c:3048
 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:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "vald sammandragsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 msgid "selected compression algorithm is invalid\n"
 msgstr "vald komprimeringsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 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:3168
+#: g10/gpg.c:3147
 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:3170
+#: g10/gpg.c:3149
 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:3172
+#: g10/gpg.c:3151
 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:3174
+#: g10/gpg.c:3153
 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:3176
+#: g10/gpg.c:3155
 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:3179
+#: g10/gpg.c:3158
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/gpg.c:3183
+#: g10/gpg.c:3162
 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:3190
+#: g10/gpg.c:3169
 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:3199
+#: g10/gpg.c:3178
 msgid "invalid personal cipher preferences\n"
 msgstr "ogiltig inställning av personligt chiffer\n"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 msgid "invalid personal digest preferences\n"
 msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 msgid "invalid personal compress preferences\n"
 msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, 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:3292
+#: g10/gpg.c:3271
 #, 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:3297
+#: g10/gpg.c:3276
 #, 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:3380
+#: g10/gpg.c:3359
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3391
+#: g10/gpg.c:3370
 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:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av \"%s\" misslyckades: %s\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnamn]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 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:3449
+#: g10/gpg.c:3428
 #, 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:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 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:3500
+#: g10/gpg.c:3479
 #, 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:3520
+#: g10/gpg.c:3499
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3683
+#: g10/gpg.c:3662
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export av nyckeln misslyckades: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4267
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
 
-#: g10/gpg.c:4321
+#: g10/gpg.c:4300
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
 
@@ -2578,11 +2575,11 @@ msgstr "utfärda enbart en varning när tidsstämpeln är orimlig"
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Användning: gpgv [flaggor] [filer] (-h för hjälp)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6856,39 +6853,48 @@ msgstr "|N|Initial PIN-kod"
 msgid "run in multi server mode (foreground)"
 msgstr "kör i multiserverläge (förgrund)"
 
-#: scd/scdaemon.c:111
-msgid "read options from file"
-msgstr "läs inställningar från fil"
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr "|NIVÅ|ställ in felsökningsnivån till NIVÅ"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
+#, fuzzy
+msgid "|FILE|write a log to FILE"
+msgstr "|FIL|skriv en granskningslogg till FIL"
+
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr "|N|anslut till läsare på port N"
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAMN|använd NAMN som ct-API-drivrutin"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAMN|använd NAMN som PC/SC-drivrutin"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 msgid "do not use the internal CCID driver"
 msgstr "använd inte den interna CCID-drivrutinen"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr "använd inte läsarens knappsats"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 msgid "allow the use of admin card commands"
 msgstr "tillåt användning av administratörskommandon för kort"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Användning: scdaemon [flaggor] (-h för hjälp)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6896,16 +6902,16 @@ msgstr ""
 "Syntax: scdaemon [flaggor] [kommando [argument]]\n"
 "Smartkortsdemon för GnuPG\n"
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 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:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "hanterare för fd %d startad\n"
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "hanterare för fd %d avslutad\n"
@@ -7562,10 +7568,6 @@ msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|använd denna nyckelserver för att slå upp nycklar"
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr "|NIVÅ|ställ in felsökningsnivån till NIVÅ"
-
 #: sm/gpgsm.c:328
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMN|använd chifferalgoritmen NAMN"
@@ -7574,12 +7576,12 @@ msgstr "|NAMN|använd chifferalgoritmen NAMN"
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMN|använd sammandragsalgoritmen NAMN"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Användning: gpgsm [flaggor] [filer] (-h för hjälp)"
 
 # Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7589,58 +7591,58 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera med S/MIME-protokollet\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: sm/gpgsm.c:629
+#: sm/gpgsm.c:610
 msgid "usage: gpgsm [options] "
 msgstr "användning: gpgsm [flaggor] "
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "OBSERVERA: kommer inte att kunna kryptera till \"%s\": %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "okänd valideringsmodell \"%s\"\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: inget värdnamn angivet\n"
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: lösenord angivet utan användare\n"
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: hoppar över denna rad\n"
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 msgid "could not parse keyserver\n"
 msgstr "kunde inte tolka nyckelserver\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr "VARNING: kör med falsk systemtid: "
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "importerar vanliga certifikat \"%s\"\n"
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan inte signera med \"%s\": %s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr "det här kommandot har ännu inte implementerats\n"
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr "ogiltigt kommando (det finns inget implicit kommando)\n"
 
@@ -7923,8 +7925,8 @@ msgstr "Flaggor som kontrollerar konfigurationen"
 msgid "Options useful for debugging"
 msgstr "Flaggor användbara för felsökning"
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FIL|skriv serverlägesloggar till FIL"
 
@@ -8303,6 +8305,12 @@ msgstr ""
 "Syntax: gpg-check-pattern [flaggor] mönsterfil\n"
 "Kontrollera en lösenfras angiven på standard in mot mönsterfilen\n"
 
+#~ msgid "read options from file"
+#~ msgstr "läs inställningar från fil"
+
+#~ msgid "Used libraries:"
+#~ msgstr "Använda bibliotek:"
+
 #~ msgid "generate PGP 2.x compatible messages"
 #~ msgstr "generera PGP 2.x-kompatibla meddelanden"
 
diff --git a/po/tr.po b/po/tr.po
index bb1ad4e5c..48477e0b6 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2006-11-04 03:45+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@belgeler.gen.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -91,7 +91,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:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -101,12 +101,12 @@ msgstr "\"%s\" oluşturulamıyor: %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
@@ -313,11 +313,12 @@ msgstr "sh tarzı komut çıktısı"
 msgid "csh-style command output"
 msgstr "csh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|DOSYA|seçenekler DOSYAdan okunur"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr "konsoldan kopulmaz"
 
@@ -325,7 +326,7 @@ msgstr "konsoldan kopulmaz"
 msgid "do not grab keyboard and mouse"
 msgstr "klavye ve fare gaspedilmez"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "sunucu için bir günlük dosyası kullanılır"
 
@@ -377,17 +378,17 @@ msgstr "ssh-agent öykünümü etkinleşir"
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|DOSYA|ortam ayarlarını ayrıca DOSYAya da yazar"
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "Yazılım hatalarını lütfen <"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] (yardım için -h)"
 
-#: agent/gpg-agent.c:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -395,146 +396,146 @@ msgstr ""
 "Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
 "GnuPG için gizli anahtar yönetimi\n"
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, fuzzy, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "libksba çok eski (gereken %s, sizinki %s)\n"
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, 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:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "`%s' oluşturulurken hata: %s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "`%s' dizini oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr "soketin ismi çok uzun\n"
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "soket oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "soketin ismi çok uzun\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "bu oturumda çalışan gpg-agent yok\n"
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "yeni PIN alınırken hata: %s\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "soket `%s'e bağlanırken hata: %s\n"
 
-#: agent/gpg-agent.c:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "soket dinleme başarısız: %s\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "`%s' soketi dinlemede\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "dizin `%s' oluşturuldu\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, 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:1513
+#: agent/gpg-agent.c:1538
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "`%s' ev dizini olarak kullanılamıyor\n"
 
-#: agent/gpg-agent.c:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "%s okunurken hata: %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, 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:1670
+#: agent/gpg-agent.c:1695
 #, 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:1690
+#: agent/gpg-agent.c:1715
 #, 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:1695
+#: agent/gpg-agent.c:1720
 #, 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:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, 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:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s durdu\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 msgid "no gpg-agent running in this session\n"
 msgstr "bu oturumda çalışan gpg-agent yok\n"
 
-#: agent/gpg-agent.c:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
 
-#: agent/gpg-agent.c:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -684,11 +685,11 @@ msgstr ""
 "Kullanıcı sertifikalarının%%0A  \"%s\"%%0Aile doğru olarak onaylanacağından "
 "son derece emin misiniz?"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 msgid "Yes"
 msgstr "Evet"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr "Hayır"
 
@@ -866,128 +867,128 @@ msgstr "çalışan gpg-agent yok - bir tane başlatılıyor\n"
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "aracıya bağlanılamıyor - son çareye başvuruluyor\n"
 
-#: common/audit.c:684
+#: common/audit.c:692
 #, fuzzy
 msgid "Certificate chain available"
 msgstr "sertifika zinciri çok uzun\n"
 
-#: common/audit.c:691
+#: common/audit.c:699
 #, fuzzy
 msgid "root certificate missing"
 msgstr "kök sertifika güvenilir olarak imli değil"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr ""
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 #, fuzzy
 msgid "Data available"
 msgstr "tüm kullanılabilir veriyi listeler"
 
-#: common/audit.c:725
+#: common/audit.c:733
 #, fuzzy
 msgid "Session key created"
 msgstr "%s: anahtarlık oluşturuldu\n"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, fuzzy, c-format
 msgid "algorithm: %s"
 msgstr "geçerliliği: %s"
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: common/audit.c:736
+#: common/audit.c:744
 #, fuzzy
 msgid "seems to be not encrypted"
 msgstr "(bu bir şifreli iletiymiş gibi görünmüyor)\n"
 
-#: common/audit.c:742
+#: common/audit.c:750
 #, fuzzy
 msgid "Number of recipients"
 msgstr "Şimdiki alıcılar:\n"
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr ""
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr ""
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr ""
 
-#: common/audit.c:823
+#: common/audit.c:831
 #, fuzzy
 msgid "Data verification succeeded"
 msgstr "imza doğrulama engellendi\n"
 
-#: common/audit.c:832
+#: common/audit.c:840
 #, fuzzy
 msgid "Signature available"
 msgstr "İmza "
 
-#: common/audit.c:837
+#: common/audit.c:845
 #, fuzzy
 msgid "Parsing signature succeeded"
 msgstr "hiç imza yok\n"
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, fuzzy, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "`%s' çittirim algoritması geçersiz\n"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, fuzzy, c-format
 msgid "Signature %d"
 msgstr "İmza "
 
-#: common/audit.c:873
+#: common/audit.c:881
 #, fuzzy
 msgid "Certificate chain valid"
 msgstr "sertifika henüz geçersiz"
 
-#: common/audit.c:884
+#: common/audit.c:892
 #, fuzzy
 msgid "Root certificate trustworthy"
 msgstr "kök sertifika güvenilir olarak imli değil"
 
-#: common/audit.c:894
+#: common/audit.c:902
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "sertifika için bir CRL yok"
 
-#: common/audit.c:911
+#: common/audit.c:919
 #, fuzzy
 msgid "Included certificates"
 msgstr "sertifikaları ihraç eder"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 #, fuzzy
 msgid "Unknown operation"
 msgstr "`%s' seçeneği bilinmiyor\n"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, fuzzy, c-format
 msgid "No help available for `%s'."
 msgstr "\"%s\" için yardım mevcut değil"
@@ -1412,7 +1413,7 @@ msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' açılamadı\n"
@@ -1934,17 +1935,17 @@ msgstr ""
 " --list-keys [isimler]      anahtarları listeler\n"
 " --fingerprint [isimler]    parmak izlerini gösterir\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Yazılım hatalarını lütfen <gnupg-bugs@gnu.org> adresine,\n"
 "çeviri hatalarını ise <gnu-tr@belgeler.org> adresine bildiriniz.\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1954,7 +1955,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1962,556 +1963,552 @@ msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr "Şifre: "
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr ""
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, 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:1345
+#: g10/gpg.c:1324
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizininde güvensiz iyelik\n"
 
-#: g10/gpg.c:1348
+#: g10/gpg.c:1327
 #, 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:1351
+#: g10/gpg.c:1330
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz iyelik\n"
 
-#: g10/gpg.c:1357
+#: g10/gpg.c:1336
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "UYARI: UYARI: '%s' evdizininde güvensiz izinler\n"
 
-#: g10/gpg.c:1360
+#: g10/gpg.c:1339
 #, 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:1363
+#: g10/gpg.c:1342
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz izinler\n"
 
-#: g10/gpg.c:1369
+#: g10/gpg.c:1348
 #, 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:1372
+#: g10/gpg.c:1351
 #, 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:1375
+#: g10/gpg.c:1354
 #, 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:1381
+#: g10/gpg.c:1360
 #, 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:1384
+#: g10/gpg.c:1363
 #, 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:1387
+#: g10/gpg.c:1366
 #, 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:1566
+#: g10/gpg.c:1545
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr "anahtarların listelenmesi sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr "imza listelemesi sırasında poliçe URLleri gösterilir"
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 msgid "show all notations during signature listings"
 msgstr "imza listelemesi sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr "imza listelemesi sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr "imza listelemesi sırasında kullanıcı kanaklı simgelemleri gösterir"
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "imza listelemesi sırasında tercih edilen anahtar sunucusu adresi gösterilir"
 
-#: g10/gpg.c:1680
+#: g10/gpg.c:1659
 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:1682
+#: g10/gpg.c:1661
 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:1684
+#: g10/gpg.c:1663
 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:1686
+#: g10/gpg.c:1665
 msgid "show the keyring name in key listings"
 msgstr "anahtar listelerinde anahtarlık ismini gösterir"
 
-#: g10/gpg.c:1688
+#: g10/gpg.c:1667
 msgid "show expiration dates during signature listings"
 msgstr "imza listelemesi sırasında zamanaşımı tarihleri gösterilir"
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, 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:1940
+#: g10/gpg.c:1919
 #, 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:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, 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:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, 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:2599
+#: g10/gpg.c:2578
 #, 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:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2613
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2616
 msgid "invalid keyserver options\n"
 msgstr "anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 msgid "invalid list options\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr "imza doğrulaması sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr "imza doğrulaması sırasında poliçe adreslerini gösterir"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 msgid "show all notations during signature verification"
 msgstr "imza doğrulaması sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr "imza doğrulaması sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri gösterir"
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 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:2689
+#: g10/gpg.c:2668
 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:2691
+#: g10/gpg.c:2670
 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:2693
+#: g10/gpg.c:2672
 #, 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:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr "imzaları PKA verisi ile doğrular"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 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:2704
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 msgid "invalid verify options\n"
 msgstr "doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, 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:2889
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, 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:3044
+#: g10/gpg.c:3023
 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:3050
+#: g10/gpg.c:3029
 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:3056
+#: g10/gpg.c:3035
 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:3069
+#: g10/gpg.c:3048
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/gpg.c:3170
+#: g10/gpg.c:3149
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3151
 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:3174
+#: g10/gpg.c:3153
 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:3176
+#: g10/gpg.c:3155
 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:3179
+#: g10/gpg.c:3158
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/gpg.c:3183
+#: g10/gpg.c:3162
 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:3190
+#: g10/gpg.c:3169
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özümleme tercihleri geçersiz\n"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, 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:3292
+#: g10/gpg.c:3271
 #, 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:3297
+#: g10/gpg.c:3276
 #, 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:3380
+#: g10/gpg.c:3359
 #, 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:3391
+#: g10/gpg.c:3370
 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:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, 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:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 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:3449
+#: g10/gpg.c:3428
 #, 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:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 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:3500
+#: g10/gpg.c:3479
 #, 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:3520
+#: g10/gpg.c:3499
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, 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:3681
+#: g10/gpg.c:3660
 #, 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:3683
+#: g10/gpg.c:3662
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' çittirim algoritması geçersiz\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4267
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4321
+#: g10/gpg.c:4300
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
@@ -2528,11 +2525,11 @@ msgstr "zaman damgası çelişkilerini uyarı olarak bildirir"
 msgid "|FD|write status info to this FD"
 msgstr "|FD|durum bilgisini bu FD'ye yazar"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Kullanımı: gpgv [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6784,39 +6781,48 @@ msgstr "|N|Yeni PIN"
 msgid "run in multi server mode (foreground)"
 msgstr "çoklu sunucu kipinde çalışır (önalanda)"
 
-#: scd/scdaemon.c:111
-msgid "read options from file"
-msgstr "seçenekler dosyadan okunur"
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr "|LDÜZEY|hata ayıklama düzeyini DÜZEY yapar"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
+#, fuzzy
+msgid "|FILE|write a log to FILE"
+msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
+
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr "|N|N. porttaki okuyucuya bağlanır"
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|İSİM|ct-API sürücüsü olarak İSİM kullanılır"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|İSİM|PC/SC sürücüsü olarak İSİM kullanılır"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 msgid "do not use the internal CCID driver"
 msgstr "dahili CCID sürücüsü kullanılmaz"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr "bir okuyucu tuştakımı kullanılmaz"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 msgid "allow the use of admin card commands"
 msgstr "yönetici kartı komutları kullanımına izin verir"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Kullanımı: scdaemon [seçenekler] (yardım için -h)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6824,18 +6830,18 @@ msgstr ""
 "Sözdizimi: scdaemon [seçenekler] [komut [arg ...]]\n"
 "GnuPG için akıllı kart artalan süreci\n"
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 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:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "fd %d için eylemci başlatıldı\n"
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "fd %d için eylemci sonlandı\n"
@@ -7510,10 +7516,6 @@ msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|MAKİNA|anahtarları aramak için bu anahtar sunucusu kullanılır"
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr "|LDÜZEY|hata ayıklama düzeyini DÜZEY yapar"
-
 #: sm/gpgsm.c:328
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
@@ -7522,11 +7524,11 @@ msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|İSİM|özümleme algoritması olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Kullanımı: gpgsm [seçenekler] [dosyalar] (yardım için -h)"
 
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7536,59 +7538,59 @@ 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:629
+#: sm/gpgsm.c:610
 msgid "usage: gpgsm [options] "
 msgstr "kullanımı: gpgsm [seçenekler] "
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "`%s'e şifrelenemez: %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "`%s' seçeneği bilinmiyor\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%d. satır: konu ismi belirtilmemiş\n"
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " a = bu anahtarı atla\n"
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "ortak sertifikalar `%s' ithal ediliyor\n"
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "`%s' kullanarak imzalanamıyor: %s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr "bu komut henüz gerçeklenmedi\n"
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7870,8 +7872,8 @@ msgstr "Yapılandırmayı denetleyen seçenekler"
 msgid "Options useful for debugging"
 msgstr "Hata ayıklamaya elverişli seçenekler"
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
 
@@ -8258,6 +8260,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "read options from file"
+#~ msgstr "seçenekler dosyadan okunur"
+
 #~ msgid "generate PGP 2.x compatible messages"
 #~ msgstr "PGP 2.x uyumlu iletiler üretilir"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 248c6c4e3..352d1f2b4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.4\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2006-07-02 10:58+0800\n"
 "Last-Translator: Meng Jie <zuxyhere@eastday.com>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -98,7 +98,7 @@ msgstr "错误的密码"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "不支持保护散列 %d\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -108,12 +108,12 @@ msgstr "无法建立‘%s’：%s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "无法打开‘%s’： %s\n"
@@ -326,12 +326,13 @@ msgstr ""
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "从‘%s’读取选项\n"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr ""
 
@@ -339,7 +340,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "在公钥服务器上搜寻密钥"
@@ -395,8 +396,8 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
@@ -404,158 +405,158 @@ msgstr ""
 "请向 <gnupg-bugs@gnu.org> 报告程序缺陷。\n"
 "请向 <zuxyhere@eastday.com> 反映简体中文翻译的问题。\n"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: agent/gpg-agent.c:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意：没有默认配置文件‘%s’\n"
 
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "建立‘%s’时发生错误：%s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "获取新 PIN 时出错：%s\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 
-#: agent/gpg-agent.c:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "已创建目录‘%s’\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) 在 %s 中出错：%s\n"
 
-#: agent/gpg-agent.c:1513
+#: agent/gpg-agent.c:1538
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1670
+#: agent/gpg-agent.c:1695
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1690
+#: agent/gpg-agent.c:1715
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1695
+#: agent/gpg-agent.c:1720
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "更新私钥失败：%s\n"
 
-#: agent/gpg-agent.c:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s：已跳过：%s\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: agent/gpg-agent.c:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
 
-#: agent/gpg-agent.c:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -698,12 +699,12 @@ msgid ""
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 #, fuzzy
 msgid "Yes"
 msgstr "yes"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr ""
 
@@ -884,128 +885,128 @@ msgstr ""
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
-#: common/audit.c:684
+#: common/audit.c:692
 #, fuzzy
 msgid "Certificate chain available"
 msgstr "证书已损坏"
 
-#: common/audit.c:691
+#: common/audit.c:699
 #, fuzzy
 msgid "root certificate missing"
 msgstr "证书已损坏"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr ""
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 #, fuzzy
 msgid "Data available"
 msgstr "列出所有可用数据"
 
-#: common/audit.c:725
+#: common/audit.c:733
 #, fuzzy
 msgid "Session key created"
 msgstr "%s：钥匙环已建立\n"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, fuzzy, c-format
 msgid "algorithm: %s"
 msgstr "有效性：%s"
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
 "\n"
 "支持的算法：\n"
 
-#: common/audit.c:736
+#: common/audit.c:744
 #, fuzzy
 msgid "seems to be not encrypted"
 msgstr "未被加密"
 
-#: common/audit.c:742
+#: common/audit.c:750
 #, fuzzy
 msgid "Number of recipients"
 msgstr "当前收件人：\n"
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr ""
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr ""
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr ""
 
-#: common/audit.c:823
+#: common/audit.c:831
 #, fuzzy
 msgid "Data verification succeeded"
 msgstr "签名验证已被抑制\n"
 
-#: common/audit.c:832
+#: common/audit.c:840
 #, fuzzy
 msgid "Signature available"
 msgstr "签名建立于 %s\n"
 
-#: common/audit.c:837
+#: common/audit.c:845
 #, fuzzy
 msgid "Parsing signature succeeded"
 msgstr "未找到签名\n"
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, fuzzy, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "无效的‘%s’散列算法\n"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, fuzzy, c-format
 msgid "Signature %d"
 msgstr "签名建立于 %s\n"
 
-#: common/audit.c:873
+#: common/audit.c:881
 #, fuzzy
 msgid "Certificate chain valid"
 msgstr "这把密钥已经过期！"
 
-#: common/audit.c:884
+#: common/audit.c:892
 #, fuzzy
 msgid "Root certificate trustworthy"
 msgstr "证书已损坏"
 
-#: common/audit.c:894
+#: common/audit.c:902
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "证书已损坏"
 
-#: common/audit.c:911
+#: common/audit.c:919
 #, fuzzy
 msgid "Included certificates"
 msgstr "证书已损坏"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 #, fuzzy
 msgid "Unknown operation"
 msgstr "未知的版本"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, fuzzy, c-format
 msgid "No help available for `%s'."
 msgstr "‘%s’没有可用的帮助"
@@ -1427,7 +1428,7 @@ msgstr "无效的指令(尝试“help”)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "无法打开‘%s’\n"
@@ -1937,17 +1938,17 @@ msgstr ""
 " --list-keys [某甲]           显示密钥\n"
 " --fingerprint [某甲]         显示指纹\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "请向 <gnupg-bugs@gnu.org> 报告程序缺陷。\n"
 "请向 <zuxyhere@eastday.com> 反映简体中文翻译的问题。\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1957,7 +1958,7 @@ msgstr ""
 "签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1965,544 +1966,540 @@ msgstr ""
 "\n"
 "支持的算法：\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr "公钥："
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr "对称加密："
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr "散列："
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 msgid "Compression: "
 msgstr "压缩："
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr ""
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "用法：gpg [选项] "
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "冲突的指令\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在‘%s’组定义里找不到等号(=)\n"
 
-#: g10/gpg.c:1345
+#: g10/gpg.c:1324
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1348
+#: g10/gpg.c:1327
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1351
+#: g10/gpg.c:1330
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1357
+#: g10/gpg.c:1336
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’权限不安全\n"
 
-#: g10/gpg.c:1360
+#: g10/gpg.c:1339
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’权限不安全\n"
 
-#: g10/gpg.c:1363
+#: g10/gpg.c:1342
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’权限不安全\n"
 
-#: g10/gpg.c:1369
+#: g10/gpg.c:1348
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1351
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1354
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1360
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1363
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1366
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1566
+#: g10/gpg.c:1545
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的配置项‘%s’\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr "列出密钥时显示用户标识"
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr "列出签名时显示策略 URL"
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 msgid "show all notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr "列出签名时显示用户提供的注记"
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出密钥时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr "列出密钥时显示用户标识的有效性"
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出密钥时显示已吊销或已过期的用户标识"
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 msgid "show the keyring name in key listings"
 msgstr "列出密钥时显示钥匙环的名称"
 
-#: g10/gpg.c:1688
+#: g10/gpg.c:1667
 msgid "show expiration dates during signature listings"
 msgstr "列出签名时显示过期日期"
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
 
-#: g10/gpg.c:1940
+#: g10/gpg.c:1919
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "注意：一般情况下不会用到 %s！\n"
 
-#: g10/gpg.c:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "‘%s’不是一个有效的签名过期日期\n"
 
-#: g10/gpg.c:2599
+#: g10/gpg.c:2578
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2613
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2616
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr "验证签名时显示照片标识"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr "验证签名时显示策略 URL"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 msgid "show all notations during signature verification"
 msgstr "验证签名时显示所有注记"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr "验证签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr "验证签名时显示用户提供的注记"
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "验证签名时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2668
 msgid "show user ID validity during signature verification"
 msgstr "验证签名时显示用户标识的有效性"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2670
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2672
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr "使用 PKA 数据验证签名的有效性"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "提升带有有效 PKA 数据的签名的信任度"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s：%d：无效的校验选项\n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 msgid "invalid verify options\n"
 msgstr "无效的校验选项\n"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法把运行路径设成 %s\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s：%d：无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr "无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程序可能会创建核心内存转储！\n"
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 会使得 %s 失效\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不可与 %s 并用\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用无意义！\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3023
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3029
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下时，不能同时签名和加密\n"
 
-#: g10/gpg.c:3056
+#: g10/gpg.c:3035
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
 
-#: g10/gpg.c:3069
+#: g10/gpg.c:3048
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的证书散列算法无效\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 msgid "completes-needed must be greater than 0\n"
 msgstr "需要的完全可信签名数一定要大于 0\n"
 
-#: g10/gpg.c:3170
+#: g10/gpg.c:3149
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需要的勉强可信签名数一定要大于 1\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3151
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "最大验证深度一定要介于 1 和 255 之间\n"
 
-#: g10/gpg.c:3174
+#: g10/gpg.c:3153
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
 
-#: g10/gpg.c:3176
+#: g10/gpg.c:3155
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3158
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
 
-#: g10/gpg.c:3183
+#: g10/gpg.c:3162
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
 
-#: g10/gpg.c:3190
+#: g10/gpg.c:3169
 msgid "invalid default preferences\n"
 msgstr "无效的默认首选项\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人对称加密算法首选项\n"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人散列算法首选项\n"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚不能和 %s 并用\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3271
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3276
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3359
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "初始化信任度数据库失败：%s\n"
 
-#: g10/gpg.c:3391
+#: g10/gpg.c:3370
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [文件名]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [文件名]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [文件名]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [文件名]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3428
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [文件名]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [文件名]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [文件名]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3500
+#: g10/gpg.c:3479
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3499
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [文件名]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [文件名]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [文件名]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key 用户标识"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 用户标识"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 用户标识 [指令]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "上传至公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥服务器接收失败：%s\n"
 
-#: g10/gpg.c:3683
+#: g10/gpg.c:3662
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "搜寻公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "从公钥服务器更新失败：%s\n"
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "无效的‘%s’散列算法\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[文件名]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始键入您的报文……\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的验证策略 URL 无效\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4267
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签名策略 URL 无效\n"
 
-#: g10/gpg.c:4321
+#: g10/gpg.c:4300
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
@@ -2519,11 +2516,11 @@ msgstr "把时间戳矛盾仅视为警告"
 msgid "|FD|write status info to this FD"
 msgstr "|FD|把状态信息写入文件描述符 FD"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "用法：gpgv [选项] [文件] (用 -h 求助)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6632,57 +6629,65 @@ msgstr "新的 PIN"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
 #, fuzzy
-msgid "read options from file"
+msgid "|FILE|write a log to FILE"
 msgstr "从‘%s’读取选项\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "显示管理员命令"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7371,10 +7376,6 @@ msgstr ""
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr ""
-
 #: sm/gpgsm.c:328
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
@@ -7385,12 +7386,12 @@ msgstr "未知的对称加密算法"
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s 签名，散列算法 %s\n"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7401,60 +7402,60 @@ msgstr ""
 "签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: sm/gpgsm.c:629
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "用法：gpg [选项] "
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "无法连接至‘%s’：%s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "未知的选项 '%s'\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(不给定描述)\n"
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "  s = 跳过这把密钥\n"
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "无法存取‘%s’：%s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7732,8 +7733,8 @@ msgstr ""
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
@@ -8119,6 +8120,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "read options from file"
+#~ msgstr "从‘%s’读取选项\n"
+
 #~ msgid "generate PGP 2.x compatible messages"
 #~ msgstr "生成与 PGP 2.x 兼容的报文"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index fcd2273cd..9b77f2405 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0.9\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2008-03-26 22:35+0800\n"
 "Last-Translator: Jedi Lin <Jedi@Jedi.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -94,7 +94,7 @@ msgstr "密語"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -104,12 +104,12 @@ msgstr "無法建立 `%s': %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
@@ -315,11 +315,12 @@ msgstr "sh 樣式的指令輸出"
 msgid "csh-style command output"
 msgstr "csh 樣式的指令輸出"
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|檔案|從「檔案」中讀取選項"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr "不要從 console 分離"
 
@@ -327,7 +328,7 @@ msgstr "不要從 console 分離"
 msgid "do not grab keyboard and mouse"
 msgstr "不要奪取鍵盤及滑鼠"
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "為伺服器使用日誌檔"
 
@@ -379,17 +380,17 @@ msgstr "啟用 ssh-agent 模擬"
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|檔案|將環境設定也寫至「檔案」"
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "翻譯瑕疵請回報給 <Jedi@Jedi.org>, 程式瑕疵則請回報給 <"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "用法: gpg-agent [選項] (或用 -h 求助)"
 
-#: agent/gpg-agent.c:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -397,144 +398,144 @@ msgstr ""
 "語法: gpg-agent [選項] [指令 [引數]]\n"
 "GnuPG 私鑰管理\n"
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "給定的除錯等級 `%s' 無效\n"
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s 太舊了 (需要 %s, 但是祇有 %s)\n"
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項中\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "建立 `%s' 時出錯: %s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "無法建立目錄 `%s': %s\n"
 
-#: agent/gpg-agent.c:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr "socket 名稱太長\n"
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "無法建立 socket: %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "socket 名稱 `%s' 太長\n"
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 msgid "error getting nonce for the socket\n"
 msgstr "為 socket 取得 nonce 時出錯\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "綁定 socket 至 `%s' 時出錯: %s\n"
 
-#: agent/gpg-agent.c:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() 失敗: %s\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "正在候聽 socket `%s'\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "`%s' 目錄已建立\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() 失敗於 `%s': %s\n"
 
-#: agent/gpg-agent.c:1513
+#: agent/gpg-agent.c:1538
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "無法使用 `%s' 做為家目錄\n"
 
-#: agent/gpg-agent.c:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "於 fd %d 讀取 nonce 時出錯: %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "經手程式 0x%lx (用於 fd %d) 已啟動\n"
 
-#: agent/gpg-agent.c:1670
+#: agent/gpg-agent.c:1695
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "經手程式 0x%lx (用於 fd %d) 已終止\n"
 
-#: agent/gpg-agent.c:1690
+#: agent/gpg-agent.c:1715
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已啟動\n"
 
-#: agent/gpg-agent.c:1695
+#: agent/gpg-agent.c:1720
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已終止\n"
 
-#: agent/gpg-agent.c:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select 失敗: %s - 等 1 秒鐘\n"
 
-#: agent/gpg-agent.c:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s 已停止\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 msgid "no gpg-agent running in this session\n"
 msgstr "在此階段中沒有執行中的 gpg-agent\n"
 
-#: agent/gpg-agent.c:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "被變造的 GPG_AGENT_INFO 環境變數\n"
 
-#: agent/gpg-agent.c:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -676,11 +677,11 @@ msgid ""
 "certificates?"
 msgstr "請問你是否徹底信任%%0A  \"%s\"%%0A正確驗證使用者憑證的能力?"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 msgid "Yes"
 msgstr "Yes"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr "No"
 
@@ -857,112 +858,112 @@ msgstr "沒有執行中的 gpg-agent - 正在啟動一份\n"
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "無法連線至代理程式 - 正試著退回\n"
 
-#: common/audit.c:684
+#: common/audit.c:692
 msgid "Certificate chain available"
 msgstr "有可用的憑證鏈"
 
-#: common/audit.c:691
+#: common/audit.c:699
 msgid "root certificate missing"
 msgstr "根憑證遺失"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr "資料已加密成功"
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 msgid "Data available"
 msgstr "有可用的資料"
 
-#: common/audit.c:725
+#: common/audit.c:733
 msgid "Session key created"
 msgstr "階段金鑰已建立"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, c-format
 msgid "algorithm: %s"
 msgstr "演算法: %s"
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "未支援的演算法: %s"
 
-#: common/audit.c:736
+#: common/audit.c:744
 msgid "seems to be not encrypted"
 msgstr "看起來未加密"
 
-#: common/audit.c:742
+#: common/audit.c:750
 msgid "Number of recipients"
 msgstr "收件者數量"
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr "收件者 %d"
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr "資料已簽署成功"
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr "資料已解密成功"
 
-#: common/audit.c:823
+#: common/audit.c:831
 msgid "Data verification succeeded"
 msgstr "資料驗證成功"
 
-#: common/audit.c:832
+#: common/audit.c:840
 msgid "Signature available"
 msgstr "有可用的簽章"
 
-#: common/audit.c:837
+#: common/audit.c:845
 msgid "Parsing signature succeeded"
 msgstr "剖析簽章成功"
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "不良的雜湊演算法: %s"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, c-format
 msgid "Signature %d"
 msgstr "簽章 %d"
 
-#: common/audit.c:873
+#: common/audit.c:881
 msgid "Certificate chain valid"
 msgstr "憑證鏈有效"
 
-#: common/audit.c:884
+#: common/audit.c:892
 msgid "Root certificate trustworthy"
 msgstr "根憑證可信賴"
 
-#: common/audit.c:894
+#: common/audit.c:902
 msgid "CRL/OCSP check of certificates"
 msgstr "CRL/OCSP 憑證檢查"
 
-#: common/audit.c:911
+#: common/audit.c:919
 msgid "Included certificates"
 msgstr "包含在內的憑證"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr "沒有稽核日誌項目."
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 msgid "Unknown operation"
 msgstr "未知的操作"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr "Gpg-Agent 可以使用"
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr "Dirmngr 可以使用"
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, c-format
 msgid "No help available for `%s'."
 msgstr "`%s' 沒有可用的說明."
@@ -1381,7 +1382,7 @@ msgstr "無效的指令  (試試看 \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個指令中沒有作用\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "無法開啟 `%s'\n"
@@ -1890,16 +1891,16 @@ msgstr ""
 " --list-keys [名字]         顯示金鑰\n"
 " --fingerprint [名字]       顯示指紋\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "請向 <gnupg-bugs@gnu.org> 回報程式瑕疵, 向 <Jedi@Jedi.org> 回報翻譯瑕疵.\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1909,7 +1910,7 @@ msgstr ""
 "簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1917,543 +1918,539 @@ msgstr ""
 "\n"
 "已支援的演算法:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr "公鑰: "
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr "編密法: "
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr "雜湊: "
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 msgid "Compression: "
 msgstr "壓縮: "
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr "已使用的函示庫:"
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "用法: gpg [選項] "
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "指令彼此矛盾\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在群組定義 `%s' 裡找不到 = 記號\n"
 
-#: g10/gpg.c:1345
+#: g10/gpg.c:1324
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1348
+#: g10/gpg.c:1327
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1351
+#: g10/gpg.c:1330
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1357
+#: g10/gpg.c:1336
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1360
+#: g10/gpg.c:1339
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1363
+#: g10/gpg.c:1342
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1369
+#: g10/gpg.c:1348
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1351
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1354
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1360
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1363
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1366
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1566
+#: g10/gpg.c:1545
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的組態項目 `%s'\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr "列出金鑰時顯示照片 ID"
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr "列出簽章時顯示原則 URL"
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 msgid "show all notations during signature listings"
 msgstr "列出簽章時顯示所有的註記"
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr "列出簽章時顯示 IETF 標準註記"
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr "列出簽章時顯示使用者提供的註記"
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出簽章時顯示偏好的金鑰伺服器 URL"
 
-#: g10/gpg.c:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr "列出金鑰時顯示使用者 ID 有效性"
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出金鑰時顯示已撤銷或過期的使用者 ID"
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出金鑰時顯示已撤銷或過期的子鑰"
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 msgid "show the keyring name in key listings"
 msgstr "在金鑰清單中顯示鑰匙圈名稱"
 
-#: g10/gpg.c:1688
+#: g10/gpg.c:1667
 msgid "show expiration dates during signature listings"
 msgstr "列出簽章時顯示有效期限"
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "請注意: 已忽略舊有的預設選項檔 `%s'\n"
 
-#: g10/gpg.c:1940
+#: g10/gpg.c:1919
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt 太舊了 (需要 %s, 但是祇有 %s)\n"
 
-#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "請注意: 一般情況下不會用到 %s!\n"
 
-#: g10/gpg.c:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' 不是個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2599
+#: g10/gpg.c:2578
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' 不是個有效的字元集\n"
 
-#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖析金鑰伺服器 URL\n"
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2613
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2616
 msgid "invalid keyserver options\n"
 msgstr "無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無效的匯入選項\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 msgid "invalid import options\n"
 msgstr "無效的匯入選項\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無效的匯出選項\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 msgid "invalid export options\n"
 msgstr "無效的匯出選項\n"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無效的清單選項\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 msgid "invalid list options\n"
 msgstr "無效的清單選項\n"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr "驗證簽章時顯示照片 ID"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr "驗證簽章時顯示原則 URL"
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 msgid "show all notations during signature verification"
 msgstr "驗證簽章時顯示所有的註記"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr "驗證簽章時顯示 IETF 標準註記"
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr "驗證簽章時顯示使用者提供的註記"
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2668
 msgid "show user ID validity during signature verification"
 msgstr "驗證簽章時顯示使用者 ID 有效性"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2670
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2672
 msgid "show only the primary user ID in signature verification"
 msgstr "驗證簽章時祇顯示主要的使用者 ID"
 
-#: g10/gpg.c:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr "以 PKA 資料驗證簽章"
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "提高對持有有效 PKA 資料之簽章的信任"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 msgid "invalid verify options\n"
 msgstr "無效的驗證選項\n"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設成 %s\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2868
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無效的自動金鑰定址清單\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr "無效的自動金鑰定址清單\n"
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程式可能會傾印出核心檔!\n"
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %s 會推翻 %s\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不允許跟 %s 併用!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 跟 %s 放在一起沒有意義!\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3023
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "你祇有在 --pgp2 模式下纔能做出分離式或明文簽章\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3029
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "你在 --pgp2 模式下時, 不能同時簽署和加密\n"
 
-#: g10/gpg.c:3056
+#: g10/gpg.c:3035
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "啟用 --pgp2 時你祇應該使用檔案, 而非管道\n"
 
-#: g10/gpg.c:3069
+#: g10/gpg.c:3048
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 
-#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 msgid "selected compression algorithm is invalid\n"
 msgstr "所選的壓縮演算法無效\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所選的憑證摘要演算法無效\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed 一定要大於 0\n"
 
-#: g10/gpg.c:3170
+#: g10/gpg.c:3149
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed 一定要大於 1\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3151
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
 
-#: g10/gpg.c:3174
+#: g10/gpg.c:3153
 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:3176
+#: g10/gpg.c:3155
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3158
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "請注意: 強烈不建議使用單純的 S2K 模式 (0)\n"
 
-#: g10/gpg.c:3183
+#: g10/gpg.c:3162
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
 
-#: g10/gpg.c:3190
+#: g10/gpg.c:3169
 msgid "invalid default preferences\n"
 msgstr "無效的預設偏好\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 msgid "invalid personal cipher preferences\n"
 msgstr "無效的個人編密法偏好\n"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 msgid "invalid personal digest preferences\n"
 msgstr "無效的個人摘要偏好\n"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 msgid "invalid personal compress preferences\n"
 msgstr "無效的個人壓縮偏好\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 還沒辦法跟 %s 一起運作\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "你不該將 `%s' 編密演算法用於 %s 模式中\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3271
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "你不該將 `%s' 摘要演算法用於 %s 模式中\n"
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3276
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "你不該將 `%s' 壓縮演算法用於 %s 模式中\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3359
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/gpg.c:3391
+#: g10/gpg.c:3370
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [檔名]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [檔名]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' 對稱式加密失敗: %s\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [檔名]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [檔名]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3428
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "你不能在 %s 模式中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [檔名]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [檔名]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [檔名]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3500
+#: g10/gpg.c:3479
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "你不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3499
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [檔名]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [檔名]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [檔名]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key 使用者ID"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 使用者ID"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 使用者ID [指令]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "送至金鑰伺服器失敗: %s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺服器接收失敗: %s\n"
 
-#: g10/gpg.c:3683
+#: g10/gpg.c:3662
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出失敗: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "用金鑰伺服器搜尋失敗: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺服器更新失敗: %s\n"
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開封裝失敗: %s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行封裝失敗: %s\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "無效的 `%s' 雜湊演算法\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[檔名]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "請開始輸入你的訊息 ...\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 msgid "the given certification policy URL is invalid\n"
 msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4267
 msgid "the given signature policy URL is invalid\n"
 msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/gpg.c:4321
+#: g10/gpg.c:4300
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
@@ -2470,11 +2467,11 @@ msgstr "僅把時間戳印矛盾視為警告"
 msgid "|FD|write status info to this FD"
 msgstr "|檔案描述|把狀態資訊寫入此「檔案描述」"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "用法: gpgv [選項] [檔案] (或用 -h 求助)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6583,39 +6580,48 @@ msgstr "|N|新增 PIN"
 msgid "run in multi server mode (foreground)"
 msgstr "以多重伺服器模式執行 (前景)"
 
-#: scd/scdaemon.c:111
-msgid "read options from file"
-msgstr "從檔案中讀取選項"
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr "|等級|設定除錯等級為「等級」"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
+#, fuzzy
+msgid "|FILE|write a log to FILE"
+msgstr "|檔案|將稽核日誌寫入至「檔案」"
+
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr "|N|從 N 埠連線至讀卡機"
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|名稱|使用「名稱」做為 ct-API 驅動程式"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|名稱|使用「名稱」做為 PC/SC 驅動程式"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 msgid "do not use the internal CCID driver"
 msgstr "不要使用內部的 CCID 驅動程式"
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr "不要使用讀卡機鍵盤"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 msgid "allow the use of admin card commands"
 msgstr "允許使用管理者卡片指令"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "用法: scdaemon [選項] (或用 -h 求助)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6623,16 +6629,16 @@ msgstr ""
 "語法: scdaemon [選項] [指令 [引數]]\n"
 "GnuPg 智慧卡服務\n"
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr "請使用 `--daemon' 選項來將此程式執行於背景\n"
 
-#: scd/scdaemon.c:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "用於 fd %d 的經手程式已啟動\n"
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "用於 fd %d 的經手程式已終止\n"
@@ -7284,10 +7290,6 @@ msgstr "|名字|使用「名字」做為預設私鑰"
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|主機|使用此金鑰伺服器來查找金鑰"
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr "|等級|設定除錯等級為「等級」"
-
 #: sm/gpgsm.c:328
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|名稱|使用「名稱」編密演算法"
@@ -7296,11 +7298,11 @@ msgstr "|名稱|使用「名稱」編密演算法"
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|名稱|使用「名稱」訊息摘要演算法"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "用法: gpgsm [選項] [檔案] (或用 -h 求助)"
 
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7310,59 +7312,59 @@ msgstr ""
 "用 S/MIME 協定來簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: sm/gpgsm.c:629
+#: sm/gpgsm.c:610
 msgid "usage: gpgsm [options] "
 msgstr "用法: gpgsm [選項] "
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "請注意: 將無法加密為 `%s': %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "未知的驗證模型 `%s'\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "第 %d 列: 沒有給定的物件名稱\n"
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "  s = 跳過這把金鑰\n"
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "無法剖析金鑰伺服器 URL\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr "警告: 正在偽造的系統時間中執行: "
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "正在匯入通用憑證 `%s'\n"
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "無法用 `%s' 來簽署: %s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr "這個指令尚未實做完成\n"
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7640,8 +7642,8 @@ msgstr "控制著組態的選項"
 msgid "Options useful for debugging"
 msgstr "對除錯有幫助的選項"
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|檔案|將伺服器模式日誌寫入至「檔案」"
 
@@ -8019,6 +8021,12 @@ msgstr ""
 "語法: gpg-check-pattern [選項] 樣式檔案\n"
 "用樣式檔案來檢查由標準輸入給定的密語\n"
 
+#~ msgid "read options from file"
+#~ msgstr "從檔案中讀取選項"
+
+#~ msgid "Used libraries:"
+#~ msgstr "已使用的函示庫:"
+
 #~ msgid "generate PGP 2.x compatible messages"
 #~ msgstr "產生 PGP 2.x 相容性訊息"
 
diff --git a/scd/ChangeLog b/scd/ChangeLog
index 8c63f3b20..9ac21d66b 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,15 @@
+2008-12-05  Werner Koch  <wk@g10code.com>
+
+	* app-openpgp.c (app_local_s): Add field ALGO_ATTR_CHANGE.
+	(app_select_openpgp): Parse new capability.
+	(show_caps): Show new capability.
+
+2008-12-03  Werner Koch  <wk@g10code.com>
+
+	* scdaemon.c (opts): Use ARGPARSE_ macros.  Add option
+	--card-timeout.
+	* command.c (update_reader_status_file): Implement it.
+
 2008-11-18  Werner Koch  <wk@g10code.com>
 
 	* scdaemon.c (make_libversion): New.
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index a64d77cde..6b90795bb 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -167,13 +167,14 @@ struct app_local_s {
   /* Keep track of extended card capabilities.  */
   struct 
   {
-    unsigned int is_v2:1;  /* This is a v2.0 compatible card.  */
+    unsigned int is_v2:1;              /* This is a v2.0 compatible card.  */
     unsigned int get_challenge:1;
     unsigned int key_import:1;
     unsigned int change_force_chv:1;
     unsigned int private_dos:1;
-    unsigned int sm_supported:1;  /* Secure Messaging is supported.  */
-    unsigned int sm_aes128:1;     /* Use AES-128 for SM.  */
+    unsigned int algo_attr_change:1;   /* Algorithm attributes changeable.  */
+    unsigned int sm_supported:1;       /* Secure Messaging is supported.  */
+    unsigned int sm_aes128:1;          /* Use AES-128 for SM.  */
     unsigned int max_certlen_3:16;
     unsigned int max_get_challenge:16; /* Maximum size for get_challenge.  */
     unsigned int max_cmd_data:16;      /* Maximum data size for a command.  */
@@ -3154,6 +3155,7 @@ show_caps (struct app_local_s *s)
   log_info ("Key-Import .....: %s\n", s->extcap.key_import? "yes":"no");
   log_info ("Change-Force-PW1: %s\n", s->extcap.change_force_chv? "yes":"no");
   log_info ("Private-DOs ....: %s\n", s->extcap.private_dos? "yes":"no");
+  log_info ("Algo-Attr-Change: %s\n", s->extcap.algo_attr_change? "yes":"no");
   log_info ("SM-Support .....: %s", s->extcap.sm_supported? "yes":"no");
   if (s->extcap.sm_supported)
     log_printf (" (%s)", s->extcap.sm_aes128? "AES-128":"3DES");
@@ -3376,6 +3378,7 @@ app_select_openpgp (app_t app)
           app->app_local->extcap.key_import       = !!(*buffer & 0x20);
           app->app_local->extcap.change_force_chv = !!(*buffer & 0x10);
           app->app_local->extcap.private_dos      = !!(*buffer & 0x08);
+          app->app_local->extcap.algo_attr_change = !!(*buffer & 0x04);
         }
       if (buflen >= 10)
         {
diff --git a/scd/command.c b/scd/command.c
index 7e1a12a5d..d94612daa 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -2095,14 +2095,18 @@ update_reader_status_file (int set_card_removed_flag)
         }
       
       /* Check whether a disconnect is pending.  */
-      for (sl=session_list; sl; sl = sl->next_session)
-        if (!sl->disconnect_allowed)
-          break; 
-      if (session_list && !sl)
+      if (opt.card_timeout)
         {
-          /* At least one connection and all allow a disconnect.  */
-          log_debug ("disconnecting card in slot %d\n", ss->slot);
-          apdu_disconnect (ss->slot);
+          for (sl=session_list; sl; sl = sl->next_session)
+            if (!sl->disconnect_allowed)
+              break; 
+          if (session_list && !sl)
+            {
+              /* FIXME: Use a real timeout.  */
+              /* At least one connection and all allow a disconnect.  */
+              log_debug ("disconnecting card in slot %d\n", ss->slot);
+              apdu_disconnect (ss->slot);
+            }
         }
       
     }
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 8cabec5e6..fc33be3a6 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -80,6 +80,7 @@ enum cmd_and_opt_values
   oDaemon,
   oBatch,
   oReaderPort,
+  oCardTimeout,
   octapiDriver,
   opcscDriver,
   oDisableCCID,
@@ -94,46 +95,53 @@ enum cmd_and_opt_values
 
 
 static ARGPARSE_OPTS opts[] = {
-
-  { aGPGConfList, "gpgconf-list", 256, "@" },
-  { aGPGConfTest, "gpgconf-test", 256, "@" },
+  ARGPARSE_c (aGPGConfList, "gpgconf-list", "@"),
+  ARGPARSE_c (aGPGConfTest, "gpgconf-test", "@"),
   
-  { 301, NULL, 0, N_("@Options:\n ") },
+  ARGPARSE_group (301, N_("@Options:\n ")),
 
-  { oServer,   "server",     0, N_("run in server mode (foreground)") },
-  { oMultiServer, "multi-server", 0,
-                                N_("run in multi server mode (foreground)") },
-  { oDaemon,   "daemon",     0, N_("run in daemon mode (background)") },
-  { oVerbose, "verbose",   0, N_("verbose") },
-  { oQuiet,	"quiet",     0, N_("be somewhat more quiet") },
-  { oSh,	"sh",        0, N_("sh-style command output") },
-  { oCsh,	"csh",       0, N_("csh-style command output") },
-  { oOptions, "options"  , 2, N_("read options from file")},
-  { oDebug,	"debug"     ,4|16, "@"},
-  { oDebugAll, "debug-all"     ,0, "@"},
-  { oDebugLevel, "debug-level" ,2, "@"},
-  { oDebugWait,"debug-wait",1, "@"},
-  { oDebugAllowCoreDump, "debug-allow-core-dump", 0, "@" },
-  { oDebugCCIDDriver, "debug-ccid-driver", 0, "@"},
-  { oDebugDisableTicker, "debug-disable-ticker", 0, "@"},
-  { oNoDetach, "no-detach" ,0, N_("do not detach from the console")},
-  { oLogFile,  "log-file"   ,2, N_("use a log file for the server")},
-  { oReaderPort, "reader-port", 2, N_("|N|connect to reader at port N")},
-  { octapiDriver, "ctapi-driver", 2, N_("|NAME|use NAME as ct-API driver")},
-  { opcscDriver, "pcsc-driver", 2, N_("|NAME|use NAME as PC/SC driver")},
-  { oDisableCCID, "disable-ccid", 0,
+  ARGPARSE_s_n (oServer,"server", N_("run in server mode (foreground)")),
+  ARGPARSE_s_n (oMultiServer, "multi-server", 
+                N_("run in multi server mode (foreground)")),
+  ARGPARSE_s_n (oDaemon, "daemon", N_("run in daemon mode (background)")),
+  ARGPARSE_s_n (oVerbose, "verbose", N_("verbose")),
+  ARGPARSE_s_n (oQuiet,	"quiet", N_("be somewhat more quiet")),
+  ARGPARSE_s_n (oSh,	"sh", N_("sh-style command output")),
+  ARGPARSE_s_n (oCsh,	"csh", N_("csh-style command output")),
+  ARGPARSE_s_s (oOptions, "options", N_("|FILE|read options from FILE")),
+  ARGPARSE_p_u (oDebug,	"debug", "@"),
+  ARGPARSE_s_n (oDebugAll, "debug-all", "@"),
+  ARGPARSE_s_s (oDebugLevel, "debug-level" ,
+                N_("|LEVEL|set the debugging level to LEVEL")),
+  ARGPARSE_s_i (oDebugWait, "debug-wait", "@"),
+  ARGPARSE_s_n (oDebugAllowCoreDump, "debug-allow-core-dump", "@"),
+  ARGPARSE_s_n (oDebugCCIDDriver, "debug-ccid-driver", "@"),
+  ARGPARSE_s_n (oDebugDisableTicker, "debug-disable-ticker", "@"),
+  ARGPARSE_s_n (oNoDetach, "no-detach", N_("do not detach from the console")),
+  ARGPARSE_s_s (oLogFile,  "log-file", N_("|FILE|write a log to FILE")),
+  ARGPARSE_s_s (oReaderPort, "reader-port", 
+                N_("|N|connect to reader at port N")),
+  ARGPARSE_s_s (octapiDriver, "ctapi-driver", 
+                N_("|NAME|use NAME as ct-API driver")),
+  ARGPARSE_s_s (opcscDriver, "pcsc-driver", 
+                N_("|NAME|use NAME as PC/SC driver")),
+  ARGPARSE_s_n (oDisableCCID, "disable-ccid",
 #ifdef HAVE_LIBUSB
                                     N_("do not use the internal CCID driver")
 #else
                                     "@"
 #endif
-                                         /* end --disable-ccid */},
-  { oDisableKeypad, "disable-keypad", 0, N_("do not use a reader's keypad")},
-  { oAllowAdmin, "allow-admin", 0, N_("allow the use of admin card commands")},
-  { oDenyAdmin,  "deny-admin",  0, "@" },  
-  { oDisableApplication, "disable-application", 2, "@"},
-
-  {0}
+                /* end --disable-ccid */),
+  ARGPARSE_s_u (oCardTimeout, "card-timeout", 
+                N_("|N|disconnect the card after N seconds of inactivity")),
+  ARGPARSE_s_n (oDisableKeypad, "disable-keypad", 
+                N_("do not use a reader's keypad")),
+  ARGPARSE_s_n (oAllowAdmin, "allow-admin", 
+                N_("allow the use of admin card commands")),
+  ARGPARSE_s_n (oDenyAdmin, "deny-admin", "@"),  
+  ARGPARSE_s_s (oDisableApplication, "disable-application", "@"),
+  
+  ARGPARSE_end ()
 };
 
 
@@ -528,12 +536,16 @@ main (int argc, char **argv )
 
         case oAllowAdmin: opt.allow_admin = 1; break;
         case oDenyAdmin: opt.allow_admin = 0; break;
+          
+        case oCardTimeout: opt.card_timeout = pargs.r.ret_ulong; break;
 
         case oDisableApplication:
           add_to_strlist (&opt.disabled_applications, pargs.r.ret_str); 
           break;
 
-        default : pargs.err = configfp? 1:2; break;
+        default: 
+          pargs.err = configfp? ARGPARSE_PRINT_WARNING:ARGPARSE_PRINT_ERROR; 
+          break;
 	}
     }
   if (configfp)
@@ -619,6 +631,7 @@ main (int argc, char **argv )
 #endif
       printf ("allow-admin:%lu:\n", GC_OPT_FLAG_NONE );
       printf ("disable-keypad:%lu:\n", GC_OPT_FLAG_NONE );
+      printf ("card-timeout:%lu:%d:\n", GC_OPT_FLAG_DEFAULT, 0);
 
       scd_exit (0);
     }
diff --git a/scd/scdaemon.h b/scd/scdaemon.h
index c0857e91b..221f84fe0 100644
--- a/scd/scdaemon.h
+++ b/scd/scdaemon.h
@@ -61,6 +61,7 @@ struct
                           cards. */
   strlist_t disabled_applications;  /* Card applications we do not
                                        want to use. */
+  unsigned long card_timeout; /* Disconnect after N seconds of inactivity.  */
 } opt;
 
 
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 7ab7dd82a..fc497bed1 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,13 @@
+2008-12-05  Werner Koch  <wk@g10code.com>
+
+	* gpg-connect-agent.c (opts): Use ARGPARSE_ macros.
+	(start_agent) [W32]: Start agent if not running.
+
+2008-12-03  Werner Koch  <wk@g10code.com>
+
+	* gpgconf-comp.c <scdaemon>: Add option --card-timeout.  Remove
+	unused option --disable-opensc.
+
 2008-10-20  Werner Koch  <wk@g10code.com>
 
 	* gpgsplit.c (write_part): Remove unused arg FNAME.  Change caller.
diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index 774abfad4..92a6e7001 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -34,6 +34,10 @@
 #include "../common/sysutils.h"
 #include "../common/membuf.h"
 #include "../common/ttyio.h"
+#ifdef HAVE_W32_SYSTEM
+#  include "../common/exechelp.h"
+#endif
+
 
 #define CONTROL_D ('D' - 'A' + 1)
 #define octdigitp(p) (*(p) >= '0' && *(p) <= '7')
@@ -59,25 +63,28 @@ enum cmd_and_opt_values
 
 
 /* The list of commands and options. */
-static ARGPARSE_OPTS opts[] =
-  {
-    { 301, NULL, 0, N_("@\nOptions:\n ") },
+static ARGPARSE_OPTS opts[] = {
+  ARGPARSE_group (301, N_("@\nOptions:\n ")),
     
-    { oVerbose, "verbose",  0, N_("verbose") },
-    { oQuiet, "quiet",      0, N_("quiet") },
-    { oHex,   "hex",        0, N_("print data out hex encoded") },
-    { oDecode,"decode",     0, N_("decode received data lines") },
-    { oRawSocket, "raw-socket", 2, N_("|NAME|connect to Assuan socket NAME")},
-    { oExec, "exec", 0, N_("run the Assuan server given on the command line")},
-    { oNoExtConnect, "no-ext-connect",
-                            0, N_("do not use extended connect mode")},
-    { oRun,  "run", 2,         N_("|FILE|run commands from FILE on startup")},
-    { oSubst, "subst", 0,      N_("run /subst on startup")}, 
-    /* hidden options */
-    { oNoVerbose, "no-verbose",  0, "@"},
-    { oHomedir, "homedir", 2, "@" },   
-    {0}
-  };
+  ARGPARSE_s_n (oVerbose, "verbose", N_("verbose")),
+  ARGPARSE_s_n (oQuiet, "quiet",     N_("quiet")),
+  ARGPARSE_s_n (oHex,   "hex",       N_("print data out hex encoded")),
+  ARGPARSE_s_n (oDecode,"decode",    N_("decode received data lines")),
+  ARGPARSE_s_s (oRawSocket, "raw-socket", 
+                N_("|NAME|connect to Assuan socket NAME")),
+  ARGPARSE_s_n (oExec, "exec", 
+                N_("run the Assuan server given on the command line")),
+  ARGPARSE_s_n (oNoExtConnect, "no-ext-connect",
+                N_("do not use extended connect mode")),
+  ARGPARSE_s_s (oRun,  "run", 
+                N_("|FILE|run commands from FILE on startup")),
+  ARGPARSE_s_n (oSubst, "subst",     N_("run /subst on startup")), 
+
+  ARGPARSE_s_n (oNoVerbose, "no-verbose", "@"),
+  ARGPARSE_s_s (oHomedir, "homedir", "@" ),   
+
+  ARGPARSE_end ()
+};
 
 
 /* We keep all global options in the structure OPT.  */
@@ -2081,6 +2088,38 @@ start_agent (void)
       /* Check whether we can connect at the standard socket.  */
       sockname = make_filename (opt.homedir, "S.gpg-agent", NULL);
       rc = assuan_socket_connect (&ctx, sockname, 0);
+
+#ifdef HAVE_W32_SYSTEM
+      /* If we failed to connect under Windows, we fire up the agent.  */
+      if (gpg_err_code (rc) == GPG_ERR_ASS_CONNECT_FAILED)
+        {
+          const char *agent_program;
+          const char *argv[3];
+          int save_rc = rc;
+          
+          if (opt.verbose)
+            log_info (_("no running gpg-agent - starting one\n"));
+          agent_program = gnupg_module_name (GNUPG_MODULE_NAME_AGENT);
+          
+          argv[0] = "--daemon";
+          argv[1] = "--use-standard-socket"; 
+          argv[2] = NULL;  
+
+          rc = gnupg_spawn_process_detached (agent_program, argv, NULL);
+          if (rc)
+            log_debug ("failed to start agent `%s': %s\n",
+                       agent_program, gpg_strerror (rc));
+          else
+            {
+              /* Give the agent some time to prepare itself. */
+              gnupg_sleep (3);
+              /* Now try again to connect the agent.  */
+              rc = assuan_socket_connect (&ctx, sockname, 0);
+            }
+          if (rc)
+            rc = save_rc;
+        }
+#endif /*HAVE_W32_SYSTEM*/
       xfree (sockname);
     }
   else
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index f7c8af1d7..1084bda72 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -599,15 +599,15 @@ static gc_option_t gc_options_scdaemon[] =
    { "pcsc-driver", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
      "gnupg", "|NAME|use NAME as PC/SC driver",
      GC_ARG_TYPE_STRING, GC_BACKEND_SCDAEMON },
-   { "disable-opensc", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
-     "gnupg", "do not use the OpenSC layer",
-     GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON },
    { "disable-ccid", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
      "gnupg", "do not use the internal CCID driver",
      GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON },
    { "disable-keypad", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
      "gnupg", "do not use a reader's keypad",
      GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON },
+   { "card-timeout", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
+     "gnupg", "|N|disconnect the card after N seconds of inactivity",
+     GC_ARG_TYPE_UINT32, GC_BACKEND_SCDAEMON },
 
    { "Debug",
      GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,
@@ -616,7 +616,7 @@ static gc_option_t gc_options_scdaemon[] =
      "gnupg", "|LEVEL|set the debugging level to LEVEL",
      GC_ARG_TYPE_STRING, GC_BACKEND_SCDAEMON },
    { "log-file", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
-     "gnupg", N_("|FILE|write server mode logs to FILE"),
+     "gnupg", N_("|FILE|write a log to FILE"),
      GC_ARG_TYPE_FILENAME, GC_BACKEND_SCDAEMON },
 
    { "Security",