Pth tweaks and improved estream.c

51 files changed, 5380 insertions, 4882 deletions

diff --git a/ChangeLog b/ChangeLog
index 3ef40eac1..9ee82990e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-17  Werner Koch  <[email protected]>
+
+	* autogen.sh <--build-w32>: Test also for a host "mingw32".
+
+	* configure.ac: Removed W32LIBS. Use NETLIBS instead.
+
 2006-10-11  Werner Koch  <[email protected]>
 
 	Released 1.9.92.
diff --git a/NEWS b/NEWS
index aaca93680..4ca4beca1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
 Noteworthy changes in version 1.9.93
 -------------------------------------------------
 
+ * In --with-validation mode gpgsm will now also ask whether a root
+   certificate should be trusted.
+
+ * Link to Pth only if really necessary.
+
 
 Noteworthy changes in version 1.9.92 (2006-10-11)
 -------------------------------------------------
diff --git a/agent/ChangeLog b/agent/ChangeLog
index 228d19542..1289ff33e 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-17  Werner Koch  <[email protected]>
+
+	* Makefile.am (gpg_agent_LDADD): Link to libcommonpth.
+	(gpg_agent_CFLAGS): New.  This allows to only link this with Pth.
+
 2006-10-16  Werner Koch  <[email protected]>
 
 	* call-pinentry.c (agent_get_confirmation): Map Cancel code here too.
diff --git a/agent/Makefile.am b/agent/Makefile.am
index 27cde6524..b92543910 100644
--- a/agent/Makefile.am
+++ b/agent/Makefile.am
@@ -27,8 +27,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl
 
 include $(top_srcdir)/am/cmacros.am
 
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(GPG_ERROR_CFLAGS) \
-	    $(PTH_CFLAGS)
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
 
 gpg_agent_SOURCES = \
 	gpg-agent.c agent.h \
@@ -48,9 +47,11 @@ gpg_agent_SOURCES = \
 
 
 common_libs = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a
+commonpth_libs = ../jnlib/libjnlib.a ../common/libcommonpth.a ../gl/libgnu.a
 pwquery_libs = ../common/libsimple-pwquery.a
 
-gpg_agent_LDADD = $(common_libs) \
+gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS)
+gpg_agent_LDADD = $(commonpth_libs) \
                 $(LIBGCRYPT_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
 	        $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS)
 
@@ -61,24 +62,19 @@ gpg_protect_tool_SOURCES = \
 
 # Needs $(NETLIBS) for libsimple-pwquery.la.
 gpg_protect_tool_LDADD =  $(pwquery_libs) $(common_libs) \
-         $(LIBGCRYPT_LIBS) -lgpg-error $(LIBINTL) $(NETLIBS)
-if HAVE_W32_SYSTEM
-gpg_protect_tool_LDADD += -lwsock32
-endif
+         $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS)
 
 gpg_preset_passphrase_SOURCES = \
 	preset-passphrase.c
 
 # Needs $(NETLIBS) for libsimple-pwquery.la.
 gpg_preset_passphrase_LDADD =  $(pwquery_libs) $(common_libs) \
-	 $(LIBGCRYPT_LIBS) -lgpg-error @LIBINTL@ $(NETLIBS)
-if HAVE_W32_SYSTEM
-gpg_preset_passphrase_LDADD += -lwsock32
-endif
+	 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS)
+
 
 # Make sure that all libs are build before we use them.  This is
 # important for things like make -j2.
-$(PROGRAMS): $(common_libs) $(pwquery_libs)
+$(PROGRAMS): $(common_libs) $(commonpth_libs) $(pwquery_libs)
 
 
 #
diff --git a/autogen.sh b/autogen.sh
index 503ddc0ee..2636c0888 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -57,7 +57,7 @@ if test "$1" = "--build-w32"; then
     
     # Locate the cross compiler
     crossbindir=
-    for host in i586-mingw32msvc i386-mingw32msvc; do
+    for host in i586-mingw32msvc i386-mingw32msvc mingw32; do
         if ${host}-gcc --version >/dev/null 2>&1 ; then
             crossbindir=/usr/${host}/bin
             conf_CC="CC=${host}-gcc"
diff --git a/common/ChangeLog b/common/ChangeLog
index f5cae13e8..68cdb99e4 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,13 @@
+2006-10-17  Werner Koch  <[email protected]>
+
+	* estream.c (struct estream_internal, es_initialize) 
+	(es_deinitialize, print_fun_writer, es_print): New and modified
+	functions to avoid tempfiles for printf style printing. 
+
+	* Makefile.am (libcommonpth_a_SOURCES): New. We now build a secon
+	version of the library with explicit Pth support.
+	* exechelp.c, estream.c: Make use of WITHOUT_GNU_PTH.
+
 2006-10-08  Werner Koch  <[email protected]>
 
 	* gpgrlhelp.c: Trun all functions into dummies if readline is not
diff --git a/common/Makefile.am b/common/Makefile.am
index 64c7f10d1..e5498ef68 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -20,16 +20,15 @@
 
 ## Process this file with automake to produce Makefile.in
 
-noinst_LIBRARIES = libcommon.a libsimple-pwquery.a libgpgrl.a
+noinst_LIBRARIES = libcommon.a libcommonpth.a libsimple-pwquery.a libgpgrl.a
 noinst_PROGRAMS = $(module_tests)
 TESTS = $(module_tests)
 
 AM_CPPFLAGS = -I$(top_srcdir)/gl
 
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(KSBA_CFLAGS) \
-            $(PTH_CFLAGS)
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)
 
-libcommon_a_SOURCES = \
+common_sources = \
 	common-defs.h \
 	util.h i18n.h \
 	errors.h \
@@ -61,6 +60,12 @@ libcommon_a_SOURCES = \
 	pka.c pka.h \
 	http.c http.h 
 
+libcommon_a_SOURCES = $(common_sources)
+libcommon_a_CFLAGS = $(AM_CFLAGS) -DWITHOUT_GNU_PTH=1
+
+libcommonpth_a_SOURCES = $(common_sources)
+libcommonpth_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS)
+
 libsimple_pwquery_a_SOURCES = \
 	simple-pwquery.c simple-pwquery.h asshelp.c asshelp.h
 
diff --git a/common/estream.c b/common/estream.c
index 77ba0876d..e056cb7b4 100644
--- a/common/estream.c
+++ b/common/estream.c
@@ -30,6 +30,7 @@
 #include <sys/types.h>
 #include <sys/file.h>
 #include <sys/stat.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -39,6 +40,11 @@
 #include <stddef.h>
 #include <assert.h>
 
+#ifdef WITHOUT_GNU_PTH /* Give the Makefile a chance to build without Pth.  */
+#undef HAVE_PTH
+#undef USE_GNU_PTH
+#endif
+
 #ifdef HAVE_PTH
 # include <pth.h>
 #endif
@@ -149,8 +155,13 @@ struct estream_internal
     unsigned int eof: 1;
   } indicators;
   unsigned int deallocate_buffer: 1;
+  unsigned int print_err: 1;     /* Error in print_fun_writer.  */
+  int print_errno;               /* Errno from print_fun_writer.  */
+  size_t print_ntotal;           /* Bytes written from in print_fun_writer. */
+  FILE *print_fp;                /* Stdio stream used by print_fun_writer.  */
 };
 
+
 typedef struct estream_internal *estream_internal_t;
 
 #define ESTREAM_LOCK(stream) ESTREAM_MUTEX_LOCK (stream->intern->lock)
@@ -916,6 +927,10 @@ es_initialize (estream_t stream,
   stream->intern->func_close = functions.func_close;
   stream->intern->strategy = _IOFBF;
   stream->intern->fd = fd;
+  stream->intern->print_err = 0;
+  stream->intern->print_errno = 0;
+  stream->intern->print_ntotal = 0;
+  stream->intern->print_fp = NULL;
   stream->intern->indicators.err = 0;
   stream->intern->indicators.eof = 0;
   stream->intern->deallocate_buffer = 0;
@@ -934,6 +949,14 @@ es_deinitialize (estream_t stream)
   es_cookie_close_function_t func_close;
   int err, tmp_err;
 
+  if (stream->intern->print_fp)
+    {
+      int save_errno = errno;
+      fclose (stream->intern->print_fp);
+      stream->intern->print_fp = NULL;
+      errno = save_errno;
+    }
+
   func_close = stream->intern->func_close;
 
   err = 0;
@@ -941,6 +964,7 @@ es_deinitialize (estream_t stream)
     SET_UNLESS_NONZERO (err, tmp_err, es_flush (stream));
   if (func_close)
     SET_UNLESS_NONZERO (err, tmp_err, (*func_close) (stream->intern->cookie));
+
   
   return err;
 }
@@ -1625,13 +1649,80 @@ doreadline (estream_t ES__RESTRICT stream, size_t max_length,
 }
 
 
+/* Helper for esprint. */
+#if defined(HAVE_FOPENCOOKIE) || defined(HAVE_FUNOPEN)
+static int 
+print_fun_writer (void *cookie_arg, const char *buffer, size_t size)
+{
+  estream_t stream = cookie_arg;
+  size_t nwritten;
+  
+  /* We don't return an error but let es_print check whether an error
+     has occured.  Internally we skip everything after an error. */
+  if (!stream->intern->print_err)
+    {
+      if (es_writen (stream, buffer, size, &nwritten))
+        {
+          stream->intern->print_err = 1;
+          stream->intern->print_errno = errno;
+        }
+      else
+        stream->intern->print_ntotal += nwritten;
+    }
+  return 0;
+}
+#endif /* HAVE_FOPENCOOKIE || HAVE_FUNOPEN */
+
+
+/* The core of our printf function.  This is called in locked state. */
 static int
 es_print (estream_t ES__RESTRICT stream,
 	  const char *ES__RESTRICT format, va_list ap)
 {
+#if defined(HAVE_FOPENCOOKIE) || defined(HAVE_FUNOPEN)
+
+  if (!stream->intern->print_fp)
+    {
+#ifdef HAVE_FOPENCOOKIE
+      {
+        cookie_io_functions_t io = { NULL };
+        io.write = print_fun_writer;
+        
+        stream->intern->print_fp = fopencookie (stream, "w", io);
+      }
+#else /*!HAVE_FOPENCOOKIE*/
+      stream->intern->print_fp = funopen (stream, NULL,
+                                          print_fun_writer, NULL, NULL);
+#endif /*!HAVE_FOPENCOOKIE*/
+      if (!stream->intern->print_fp)
+        return -1;
+    }
+
+  stream->intern->print_err = 0;
+  stream->intern->print_errno = 0;
+  stream->intern->print_ntotal = 0;
+
+  if ( vfprintf (stream->intern->print_fp, format, ap) < 0 
+       || fflush (stream->intern->print_fp) )
+    {
+      stream->intern->print_errno = errno;
+      stream->intern->print_err = 1;
+      fclose (stream->intern->print_fp);
+      stream->intern->print_fp = NULL;
+    }
+  if (stream->intern->print_err)
+    {
+      errno = stream->intern->print_errno;
+      return -1;
+    }
+
+  return (int)stream->intern->print_ntotal;
+  
+#else /* No funopen or fopencookie. */
+  
   char data[BUFFER_BLOCK_SIZE];
-  size_t bytes_written;
   size_t bytes_read;
+  size_t bytes_written;
   FILE *tmp_stream;
   int err;
 
@@ -1675,11 +1766,11 @@ es_print (estream_t ES__RESTRICT stream,
     goto out;
 
  out:
-
   if (tmp_stream)
     fclose (tmp_stream);
 
   return err ? -1 : bytes_written;
+#endif /* no funopen or fopencookie */
 }
 
 
diff --git a/common/exechelp.c b/common/exechelp.c
index 19fb04ffa..b4700c5cd 100644
--- a/common/exechelp.c
+++ b/common/exechelp.c
@@ -29,6 +29,12 @@
 #include <signal.h>
 #include <unistd.h> 
 #include <fcntl.h>
+
+#ifdef WITHOUT_GNU_PTH /* Give the Makefile a chance to build without Pth.  */
+#undef HAVE_PTH
+#undef USE_GNU_PTH
+#endif
+
 #ifdef USE_GNU_PTH      
 #include <pth.h>
 #endif
diff --git a/configure.ac b/configure.ac
index f93ab7260..b7a96a269 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1107,11 +1107,10 @@ GNUPG_CHECK_GNUMAKE
 # Add some extra libs here so that previous tests don't fail for
 # mysterious reasons - the final link step should bail out. 
 if test "$have_w32_system" = yes; then
-   W32LIBS="-lwsock32"
+   NETLIBS="${NETLIBS} -lwsock32"
 fi
 
 AC_SUBST(NETLIBS)
-AC_SUBST(W32LIBS)
 
 
 #
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0ceb6e05c..85ac9c518 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-12  Werner Koch  <[email protected]>
+
+	* Makefile.am (man_MANS): Do not install gnupg.7 due to a conflict
+	with gpg1.
+
 2006-10-12  David Shaw  <[email protected]>
 
 	* gpg.texi: Document --s2k-count.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 06b02f6a2..ab8543b70 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -51,13 +51,13 @@ YAT2M_OPTIONS = -I $(srcdir) \
 
 myman_sources = gnupg7.texi gpg.texi gpgsm.texi gpg-agent.texi \
                 scdaemon.texi tools.texi
-myman_pages   = gnupg.7 gpg2.1 gpgsm.1 gpg-agent.1 scdaemon.1 gpgv2.1 \
+myman_pages   = gpg2.1 gpgsm.1 gpg-agent.1 scdaemon.1 gpgv2.1 \
                 watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \
 		gpg-connect-agent.1 gpgparsemail.1 symcryptrun.1 \
 		gpgsm-gencert.sh.1
 
 man_MANS = $(myman_pages)
-
+noinst_MANS = gnupg.7
 
 watchgnupg_SOURCE = gnupg.texi
 
@@ -65,7 +65,7 @@ watchgnupg_SOURCE = gnupg.texi
 CLEANFILES = faq.raw.xref
 
 DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \
-		 $(myman_pages)
+		 $(myman_pages) gnupg.7
 
 yat2m_SOURCES = yat2m.c
 
@@ -112,7 +112,7 @@ yat2m-stamp: $(myman_sources)
 
 yat2m-stamp: yat2m
 
-$(myman_pages) : yat2m-stamp
+$(myman_pages) gnupg.7 : yat2m-stamp
 	@if test -f $@; then :; else \
             trap 'rm -rf yat2m-stamp yat2m-lock' 1 2 13 15; \
                if mkdir yat2m-lock 2>/dev/null; then \
diff --git a/g10/ChangeLog b/g10/ChangeLog
index a23e5842e..b38be9f4d 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-17  Werner Koch  <[email protected]>
+
+	* Makefile.am (LDADD): Replaced W32LIBS by NETLIBS.
+
 2006-10-12  David Shaw  <[email protected]>
 
 	* parse-packet.c (parse_symkeyenc): Show the unpacked as well as
diff --git a/g10/Makefile.am b/g10/Makefile.am
index d7a5ac1f6..cc0192c1b 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -27,7 +27,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common \
 
 include $(top_srcdir)/am/cmacros.am
 
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(GPG_ERROR_CFLAGS)
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
 
 needed_libs = ../gl/libgnu.a ../common/libcommon.a ../jnlib/libjnlib.a
 
@@ -110,7 +110,7 @@ gpgv2_SOURCES = gpgv.c           \
 
 LDADD =  $(needed_libs) ../common/libgpgrl.a \
          $(ZLIBS) $(DNSLIBS) $(LIBREADLINE) \
-         $(LIBINTL) $(CAPLIBS) $(W32LIBS)
+         $(LIBINTL) $(CAPLIBS) $(NETLIBS)
 gpg2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS)
 gpgv2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS)
 
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 4e634e05e..a8f3f8956 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-17  Werner Koch  <[email protected]>
+
+	* Makefile.am: Removed W32LIBS as they are included in NETLIBS.
+	Removed PTH_LIBS.
+
 2006-09-26  Werner Koch  <[email protected]>
 
 	* curl-shim.c: Adjusted for changes in http.c.
diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am
index 5ad30782e..d72da1406 100644
--- a/keyserver/Makefile.am
+++ b/keyserver/Makefile.am
@@ -47,20 +47,20 @@ gpg2keys_curl_SOURCES = gpgkeys_curl.c ksutil.c ksutil.h no-libgcrypt.c
 
 gpg2keys_ldap_CPPFLAGS = $(LDAP_CPPFLAGS) $(AM_CPPFLAGS)
 gpg2keys_ldap_LDADD = $(LDAPLIBS) $(NETLIBS) \
-                      $(other_libs) $(W32LIBS)
+                      $(other_libs)
 
 gpg2keys_finger_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) \
-                        $(NETLIBS) $(other_libs) $(W32LIBS)
+                        $(NETLIBS) $(other_libs)
 
 if FAKE_CURL
 gpg2keys_curl_SOURCES += curl-shim.c curl-shim.h
 gpg2keys_curl_CPPFLAGS = $(AM_CPPFLAGS)
 gpg2keys_curl_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
-	              $(other_libs) $(PTH_LIBS) $(W32LIBS)
+	              $(other_libs) 
 gpg2keys_hkp_SOURCES += curl-shim.c curl-shim.h
 gpg2keys_hkp_CPPFLAGS = $(AM_CPPFLAGS)
 gpg2keys_hkp_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
-	             $(other_libs)  $(PTH_LIBS) $(W32LIBS)
+	             $(other_libs) 
 else
 gpg2keys_curl_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS)
 gpg2keys_curl_LDADD = $(LIBCURL) $(GETOPT)
diff --git a/po/be.po b/po/be.po
index e57910a35..538f93691 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 2003-10-30 16:35+0200\n"
 "Last-Translator: Ales Nyakhaychyk <[email protected]>\n"
 "Language-Team: Belarusian <[email protected]>\n"
@@ -83,8 +83,8 @@ msgstr ""
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr ""
@@ -198,13 +198,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "шматслоўнасьць"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "працаваць менш шматслоўна"
 
@@ -228,7 +228,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 msgid "use a log file for the server"
 msgstr ""
@@ -284,14 +284,14 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Калі ласка, паведамляйце пра памылкі на <[email protected]>.\n"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ""
@@ -317,30 +317,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
 #: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
@@ -569,58 +569,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 #, fuzzy
 msgid "Yes"
 msgstr "yes [так]"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
@@ -1426,7 +1426,7 @@ msgstr "%s: немагчыма стварыць тэчку: %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1442,27 +1442,27 @@ msgstr "|[файл]|зрабіць подпіс"
 msgid "|[file]|make a clear text signature"
 msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "зрабіць адчэплены подпіс"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "зашыфраваць даньні"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "шыфраваньне толькі сымэтрычнымі шыфрамі"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "разшыфраваць даньні (дапомна)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "праверыць подпіс"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "паказаць сьпіс ключоў"
 
@@ -1475,15 +1475,15 @@ msgstr "паказаць сьпіс ключоў і подпісаў"
 msgid "list and check key signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "стварыць новую пару ключоў"
 
@@ -1515,11 +1515,11 @@ msgstr ""
 msgid "export keys"
 msgstr "экспарт ключоў"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
@@ -1555,7 +1555,7 @@ msgstr ""
 msgid "|algo [files]|print message digests"
 msgstr ""
 
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1566,31 +1566,31 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr ""
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr ""
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "выкарыстоўваць у якасьці файла вываду"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "не рабіць ніякіх зьменаў"
 
@@ -1606,7 +1606,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1614,7 +1614,7 @@ msgstr ""
 "@\n"
 "(Глядзіце man старонку, для больш поўнага апісаньня ўсіх загадаў і выбараў)\n"
 
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1652,7 +1652,7 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: g10/gpg.c:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1680,7 +1680,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "несумяшчальныя загады\n"
 
@@ -1933,7 +1933,7 @@ msgstr "%s:%d: недапушчальныя выбары экспартаван�
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
@@ -1973,11 +1973,11 @@ msgstr ""
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
@@ -2208,7 +2208,7 @@ msgstr "выдаліць ключы са зьвязку грамадскіх к�
 msgid "make timestamp conflicts only a warning"
 msgstr ""
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr ""
 
@@ -6092,62 +6092,62 @@ msgstr ""
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6155,112 +6155,112 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 msgid "error reading application data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 #, fuzzy
 msgid "key already exists\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 #, fuzzy
 msgid "generating new key\n"
 msgstr "стварыць новую пару ключоў"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "стварыць новую пару ключоў"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -6269,7 +6269,7 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 msgid "read options from file"
 msgstr ""
 
@@ -6348,129 +6348,137 @@ msgstr ""
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr ""
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "сакрэтны ключ недаступны"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 msgid "certificate has been revoked"
 msgstr ""
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "дрэнны сэртыфікат"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Даведка адсутнічае"
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 msgid "no issuer found in certificate"
 msgstr ""
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Гэты ключ згубіў састарэў!"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "праверыць подпіс"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6479,7 +6487,7 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA патрабуе выкарыстаньня 160-і бітавага хэш-альгарытму\n"
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6555,42 +6563,47 @@ msgstr ""
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr ""
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
@@ -6642,190 +6655,190 @@ msgstr "памылка стварэньня \"%s\": %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[файл]|зрабіць подпіс"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "дрэнны сэртыфікат"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "дрэнны сэртыфікат"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "дрэнны сэртыфікат"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "дрэнны пароль"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 msgid "create base-64 encoded output"
 msgstr ""
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 #, fuzzy
 msgid "|NAME|use NAME as default recipient"
 msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 msgid "use the default key as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "праверыць подпісы ключа"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr "заўсёдвы выкарыстоўваць MDC для шыфраваньня"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "add this secret keyring to the list"
 msgstr ""
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ВУЗЕЛ|     выкарыстоўваць гэты паслужнік для пошуку ключоў"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|НАЗВА|     усталяваць мноства знакаў тэрмінала"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:521
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -6836,36 +6849,36 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:615
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -6985,7 +6998,7 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index ffd3b21bb..3131e9f2a 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <[email protected]>\n"
 "Language-Team: Catalan <[email protected]>\n"
@@ -105,8 +105,8 @@ msgstr "no s'ha pogut crear «%s»: %s\n"
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
@@ -223,13 +223,13 @@ msgstr ""
 
 # Un dels dos és en la llista d'opcions amb --help. Urgh. jm
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "detall"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "una mica més silenciós"
 
@@ -254,7 +254,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 #, fuzzy
 msgid "use a log file for the server"
@@ -313,14 +313,14 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Si us plau, informeu sobre els errors a <[email protected]>.\n"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ""
@@ -346,30 +346,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, 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:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
@@ -603,58 +603,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 #, fuzzy
 msgid "Yes"
 msgstr "sí|si"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "no es pot obrir el fitxer: %s\n"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -1514,7 +1514,7 @@ msgstr "s'usarà la clau secundària %08lX en lloc de la primària %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clau %08lX: clau secreta sense clau pública - es descarta\n"
 
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1530,27 +1530,27 @@ msgstr "|[fitxer]|crea una signatura"
 msgid "|[file]|make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "crea una signatura separada"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "xifra dades"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "xifra només amb xifratge simètric"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "desxifra dades (predeterminat)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "verifica una signatura"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "llista claus"
 
@@ -1565,15 +1565,15 @@ msgid "list and check key signatures"
 msgstr "comprova les signatures de la claus"
 
 # «dactilars» o «digitals»?  ivb
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "llista claus i empremtes digitals"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "llista claus secretes"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "genera un nou parell de claus"
 
@@ -1605,11 +1605,11 @@ msgstr "genera un certificat de revocació"
 msgid "export keys"
 msgstr "exporta claus"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "exporta claus a un servidor de claus"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "importa claus d'un servidor de claus"
 
@@ -1645,7 +1645,7 @@ msgstr "actualitza la base de dades de confiança"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fitxers]|imprimeix resums de missatges"
 
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1656,31 +1656,31 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr "crea eixida amb armadura ascii"
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr "usa aquest id per a signar o desxifrar"
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivell de compressió N (0 no comprimeix)"
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr "usa el mode de text canònic"
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "fitxer d'eixida"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "no fa cap canvi"
 
@@ -1696,7 +1696,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1707,7 +1707,7 @@ msgstr ""
 # Crec q (A)lice (orig.), (B)ob (dest.), etc. són noms usats pel Zimmerman
 # en el manual original de PGP.  A, B, C...  ivb
 # En efecte. Idem per a Mallory més endavant. Els deixe com a l'original. jm
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1750,7 +1750,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:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1778,7 +1778,7 @@ msgstr "Compressió: "
 msgid "usage: gpg [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
@@ -2041,7 +2041,7 @@ msgstr "%s:%d opcions d'exportació no vàlides\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVÍS: el programa podria crear un fitxer core!\n"
 
@@ -2086,11 +2086,11 @@ msgstr ""
 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:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
@@ -2326,7 +2326,7 @@ msgstr "pren les claus d'aquest anell"
 msgid "make timestamp conflicts only a warning"
 msgstr "fes els conflictes de marques de temps només un avís"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr "|FD|escriu informació d'estat en aquest FD"
 
@@ -6651,62 +6651,62 @@ msgstr ""
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6714,113 +6714,113 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 #, fuzzy
 msgid "key already exists\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genera un nou parell de claus"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -6829,7 +6829,7 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 #, fuzzy
 msgid "read options from file"
 msgstr "s'estan llegint opcions de «%s»\n"
@@ -6911,140 +6911,148 @@ msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: aquesta clau ha estat revocada!"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Certificat correcte"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "La clau és disponible en: "
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Certificat correcte"
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 #, fuzzy
 msgid "certificate not yet valid"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 #, fuzzy
 msgid "certificate has expired"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 #, fuzzy
 msgid "root certificate is not marked trusted"
 msgstr ""
 "No s'han trobat certificats amb confiança no definida.\n"
 "\n"
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Empremta digital:"
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 #, fuzzy
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "No s'han trobat certificats amb confiança no definida.\n"
 "\n"
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifica una signatura"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -7053,7 +7061,7 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA requereix l'ús d'un algoritme de dispersió de 160 bits\n"
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7140,42 +7148,47 @@ msgstr ""
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "No és una adreça vàlida\n"
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "error en crear l'anell «%s»: %s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
@@ -7228,186 +7241,186 @@ msgstr "error en la creació de la contrasenya: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "%s: error en escriure el registre de directoris: %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[fitxer]|crea una signatura"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "llista claus secretes"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "elimina claus de l'anell públic"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificat correcte"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificat correcte"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "canvia la contrasenya"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crea eixida amb armadura ascii"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 msgid "use the default key as default recipient"
 msgstr "usa la clau predeterminada com a destinatari predeterminat"
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr "no usa el terminal en absolut"
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 msgid "force v3 signatures"
 msgstr "força signatures v3"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr "sempre utilitza un MDC per a xifrar"
 
 # Mode desatès (SC)  ivb
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr "mode desatès: no pregunta mai"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr "suposa «sí» en la majoria de les preguntes"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr "suposa «no» en la majoria de les preguntes"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "add this keyring to the list of keyrings"
 msgstr "afegeix aquest anell a la llista"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "add this secret keyring to the list"
 msgstr "afegeix aquest anell secret a la llista"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|usa NOM com a clau secreta predeterminada"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|usa aquest servidor per a cercar claus"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|el joc de caràcters serà NOM"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|usa l'algoritme de xifratge NOM"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|usa l'algoritme de resum de missatges NOM"
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritme de compressió N"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 #, 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:523
+#: sm/gpgsm.c:521
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7418,37 +7431,37 @@ msgstr ""
 "signa, comprova, xifra o desxifra\n"
 "l'operació predeterminada depén de les dades introduïdes\n"
 
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:615
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "no s'ha pogut connectar amb «%s»: %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
 # No em passe! ;)  ivb
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7569,7 +7582,7 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
diff --git a/po/cs.po b/po/cs.po
index 7d76337ef..3d6c58c60 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 2004-11-26 09:12+0200\n"
 "Last-Translator: Roman Pavlik <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
@@ -85,8 +85,8 @@ msgstr "nemohu vytvo�it `%s': %s\n"
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
@@ -199,13 +199,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "s dodate�n�mi informacemi"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "b�t o trochu v�c tich�"
 
@@ -230,7 +230,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 #, fuzzy
 msgid "use a log file for the server"
@@ -288,7 +288,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 #, fuzzy
 msgid "Please report bugs to <"
@@ -297,7 +297,7 @@ msgstr ""
 "P�ipom�nky k p�ekladu <[email protected]>.\n"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ""
@@ -323,30 +323,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, 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:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
@@ -579,58 +579,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 #, fuzzy
 msgid "Yes"
 msgstr "ano"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nemohu otev��t podepsan� data '%s'\n"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
@@ -1432,7 +1432,7 @@ msgstr "pou��v�m podkl�� %s m�sto prim�rn�ho kl��e %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kl�� %s: tajn� kl�� bez kl��e ve�ejn�ho - p�esko�eno\n"
 
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1448,27 +1448,27 @@ msgstr "|[soubor]|vytvo�it podpis"
 msgid "|[file]|make a clear text signature"
 msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "vytvo�it podpis odd�len� od dokumentu"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "�ifrovat data"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrov�n� pouze se symetrickou �ifrou"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "de�ifrovat data (implicitn�)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "verifikovat podpis"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "vypsat seznam kl���"
 
@@ -1480,15 +1480,15 @@ msgstr "vypsat seznam kl��� a podpis�"
 msgid "list and check key signatures"
 msgstr "vypsat a zkontrolovat podpisy kl���"
 
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "vypsat seznam kl��� a fingerprint�"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "vypsat seznam tajn�ch kl���"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "vytvo�it nov� p�r kl���"
 
@@ -1520,11 +1520,11 @@ msgstr "vytvo�it revoka�n� certifik�t"
 msgid "export keys"
 msgstr "exportovat kl��e"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "exportovat kl��e na server kl���"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "importovat kl��e ze serveru kl���"
 
@@ -1560,7 +1560,7 @@ msgstr "aktualizovat datab�zi d�v�ry"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [soubory]  vypi� hash"
 
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1571,35 +1571,35 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|JM�NO|�ifrovat pro JM�NO"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "pou��t tento id u�ivatele pro podeps�n�\n"
 " nebo de�ifrov�n�"
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavit �rov�� komprimace N (0 - ��dn�\n"
 " komprimace)"
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr "pou��t kanonick� textov� m�d"
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "pou��t jako v�stupn� soubor"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "neprov�d�t ��dn� zm�ny"
 
@@ -1615,7 +1615,7 @@ msgstr "pou��t chov�n� striktn� podle OpenPGP"
 msgid "generate PGP 2.x compatible messages"
 msgstr "generovat zpr�vu komplatibiln� s PGP 2.x"
 
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1623,7 +1623,7 @@ msgstr ""
 "@\n"
 "(Pou�ijte manu�lov� str�nky pro kompletn� seznam v�ech p��kaz� a mo�nost�)\n"
 
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1661,7 +1661,7 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: g10/gpg.c:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1689,7 +1689,7 @@ msgstr "Komprese: "
 msgid "usage: gpg [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "konfliktn� p��kazy\n"
 
@@ -1965,7 +1965,7 @@ msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
 
@@ -2007,11 +2007,11 @@ msgstr "v m�du --pgp2 mus�te pou��t soubor (ne rouru).\n"
 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:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
@@ -2244,7 +2244,7 @@ msgstr "ber kl��e z t�to kl��enky (keyringu)"
 msgid "make timestamp conflicts only a warning"
 msgstr "pouze varov�n� p�i konfliktu �asov�ho raz�tka"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapsat informace o stavu do tohoto FD"
 
@@ -6356,62 +6356,62 @@ msgstr ""
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "ulo�en� fingerprintu se nezda�ilo: %s\n"
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "ulo�en� datumu vytvo�en� se nezda�ilo: %s\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "�ten� ve�ejn�ho kl��e se nezda�ilo: %s\n"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr "odpov�� neobsahuje ve�ejn� kl��\n"
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr "odpov�� neobsahuje RSA modulus\n"
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr "odpov�� neobsahuje ve�ejn� RSA exponent\n"
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "funkce PIN callback zkon�ila chybou: %s\n"
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN pro CHV%d je p��li� kr�tk�; minim�ln� d�lka je %d\n"
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verifikace CHV%d se nezda�ila: %s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr "p��stup k administr�torsk�m p��kaz�m nen� nakonfigurov�n\n"
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr "chyba p�i z�sk�n� CHV z karty\n"
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr "karta je trvale uzam�ena!\n"
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6420,110 +6420,110 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr "|A|PIN administr�tora"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nov� PIN administr�tora"
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|N|New PIN"
 msgstr "|N|Nov� PIN"
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "chyba p�i z�sk�n� nov�ho PINu: %s\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 msgid "error reading application data\n"
 msgstr "chyba p�i �ten� aplika�n�ch dat\n"
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 msgid "error reading fingerprint DO\n"
 msgstr "chyba p�i �ten� fingerpritnu DO\n"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 msgid "key already exists\n"
 msgstr "kl�� ji� existuje\n"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr "existuj�c� kl�� bude p�eps�n\n"
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 msgid "generating new key\n"
 msgstr "generov�n� nov�ho kl��e\n"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr "chyb� �asov� raz�tko vytvo�en�\n"
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "sch�z� RSA modulus nebo nem� velikost %d bit�\n"
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "sch�z� ve�ejn� RSA exponent nebo je del�� ne� %d bit�\n"
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "sch�z� RSA prime %s nebo nem� velikost %d bit�\n"
 
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nelze ulo�it kl��: %s\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr "pros�m po�kejte ne� bude kl�� vygenerov�n ...\n"
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 msgid "generating key failed\n"
 msgstr "henerov�n� kl��e se nezda�ilo\n"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generov�n� kl��e dokon�eno (%d sekund)\n"
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "neplatn� struktura OpenPGP kraty (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "dosud vytvo�en� podpisy: %lu\n"
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "ov��en� administr�torsk�ho PIN je nyn� prost�ednictv�m tohoto p��kazu "
 "zak�z�no\n"
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "p��stup na %s se nezda�il - vadn� OpenPGP karta?\n"
@@ -6532,7 +6532,7 @@ msgstr "p��stup na %s se nezda�il - vadn� OpenPGP karta?\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 #, fuzzy
 msgid "read options from file"
 msgstr "�tu mo�nosti z `%s'\n"
@@ -6611,131 +6611,139 @@ msgstr "gpg-agent protokol verze %d nen� podporov�n\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent protokol verze %d nen� podporov�n\n"
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "Nemohu otev��t `%s': %s\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "exportov�n� tajn�ho kl��e nen� povoleno\n"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "nelze ulo�it kl��: %s\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "POZN�MKA: kl�� byl revokov�n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "�patn� certifik�t"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Kl�� k dispozici na: "
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "vytvo�it revoka�n� certifik�t"
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Platnost kl��e vypr�ela!"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "CA fingerprint: "
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifikovat podpis"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6744,7 +6752,7 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA po�aduje pou�it� 160-ti bitov�ho hashovac�ho algoritmu\n"
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6820,42 +6828,47 @@ msgstr ""
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "chyba p�i vytv��en� souboru kl��� (keyring)`%s': %s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "chyba p�i vytv��en� souboru kl��� (keyring)`%s': %s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
@@ -6908,194 +6921,194 @@ msgstr "chyba p�i vytv��en� hesla: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "%s: chyba p�i z�pisu adres��ov�ho z�znamu: %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[soubor]|vytvo�it podpis"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "vypsat seznam tajn�ch kl���"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "�patn� certifik�t"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "odstranit kl�� ze souboru ve�ejn�ch kl���"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "�patn� certifik�t"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "�patn� certifik�t"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "register a smartcard"
 msgstr "p�idat kl�� na kartu"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "zm�nit heslo"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "p�esko�eno: ve�ejn� kl�� je u� nastaven podle implicitn�ho adres�ta\n"
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "kontrolovat podpisy"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "ber kl��e z t�to kl��enky (keyringu)"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "Pro proveden� t�to operace je pot�eba tajn� kl��.\n"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|JM�NO|�ifrovat pro JM�NO"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "nezn�m� �ifrovac� algoritmus"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "nezn�m� komprima�n� algoritmus"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:521
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7106,36 +7119,36 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:615
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "nemohu se p�ipojit k `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7256,7 +7269,7 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
diff --git a/po/da.po b/po/da.po
index c89111b30..57fc4667b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 2003-12-03 16:11+0100\n"
 "Last-Translator: Birger Langkjer <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
@@ -84,8 +84,8 @@ msgstr "kan ikke oprette %s: %s\n"
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
@@ -200,13 +200,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "meddelsom"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "v�r mere stille"
 
@@ -231,7 +231,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 #, fuzzy
 msgid "use a log file for the server"
@@ -289,14 +289,14 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ""
@@ -322,30 +322,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
 #: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
@@ -573,58 +573,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 #, fuzzy
 msgid "Yes"
 msgstr "ja"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
@@ -1443,7 +1443,7 @@ msgstr "bruger sekund�r n�gle %08lX istedetfor prim�r n�gle %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1459,27 +1459,27 @@ msgstr "|[filer]|opret en signatur"
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "krypt�r data"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "krypt�r kun med symmetriske cifre"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "afkrypt�r data (standard)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "vis n�gler"
 
@@ -1492,15 +1492,15 @@ msgstr "vis n�gler og signaturer"
 msgid "list and check key signatures"
 msgstr "tjek n�glesignaturer"
 
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "vis hemmelige n�gler"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "gener�r et nyt n�glepar"
 
@@ -1534,11 +1534,11 @@ msgstr "Gener�r en annull�rbar certifikat"
 msgid "export keys"
 msgstr "eksport�r n�gler"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "import�r n�gler fra en n�gleserver"
 
@@ -1576,7 +1576,7 @@ msgstr "opdat�r tillidsdatabasen"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresum�"
 
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1587,31 +1587,31 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|krypt�r for NAME"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
@@ -1627,13 +1627,13 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1672,7 +1672,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/gpg.c:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1701,7 +1701,7 @@ msgstr "Kommentar: "
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
@@ -1960,7 +1960,7 @@ msgstr "ADVARSEL: '%s' er en tom fil\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
@@ -2000,11 +2000,11 @@ msgstr ""
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
@@ -2249,7 +2249,7 @@ msgstr "Slet denne n�gle fra n�gleringen? "
 msgid "make timestamp conflicts only a warning"
 msgstr "tidsstempelkonflikt"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinfo til denne FD"
 
@@ -6238,62 +6238,62 @@ msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
 # er det klogt at overs�tte TrustDB?
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6301,114 +6301,114 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "fejl i trailerlinie\n"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 #, fuzzy
 msgid "key already exists\n"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gener�r et nyt n�glepar"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
 # er det klogt at overs�tte TrustDB?
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
@@ -6417,7 +6417,7 @@ msgstr "ingen gyldig OpenPGP data fundet.\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 #, fuzzy
 msgid "read options from file"
 msgstr "l�ser indstillinger fra `%s'\n"
@@ -6498,133 +6498,141 @@ msgstr "valgte cifferalgoritme %d er ugyldig\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
 # er det klogt at overs�tte TrustDB?
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "n�gle %08lX: n�gle er blevet annulleret!\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Godt certifikat"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Godt certifikat"
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certifikatl�seproblem: %s\n"
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 #, fuzzy
 msgid "certificate has expired"
 msgstr "certifikatl�seproblem: %s\n"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Fingeraftryk:"
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "certifikatl�seproblem: %s\n"
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "godkend en signatur"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6633,7 +6641,7 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr ""
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6708,42 +6716,47 @@ msgstr ""
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "fejl ved skrivning af n�glering `%s': %s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
@@ -6796,186 +6809,186 @@ msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "skriver til `%s'\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "vis hemmelige n�gler"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "ugyldigt certifikat"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "Godt certifikat"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "Godt certifikat"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "opret ascii beskyttet uddata"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 msgid "use the default key as default recipient"
 msgstr "brug standard n�glen som standard modtager"
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr "brug overhovedet ikke terminalen"
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 msgid "force v3 signatures"
 msgstr "tving v3 signaturer"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr "brug altid en MDC for kryptering"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr "k�rselsmodus: sp�rg aldrig"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr "forvent ja til de fleste spr�gsm�l"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr "forvent nej til de fleste spr�gsm�l"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "add this keyring to the list of keyrings"
 msgstr "tilf�j denne n�glering til n�gleringslisten"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "add this secret keyring to the list"
 msgstr "tilf�j denne hemmeligen�glering til listen"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|brug NAME som standard hemmelign�gle"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|brug denne n�gletjener til at sl� n�gler op"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|s�t terminal karakters�t til NAME"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|brug cifferalgoritme NAME"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|brug meddelelsesresum� algoritme NAME"
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 msgid "|N|use compress algorithm N"
 msgstr "|N|brug kompresalgoritme N"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 #, 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:523
+#: sm/gpgsm.c:521
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -6986,36 +6999,36 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:615
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "brug: gpg [flag] "
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7138,7 +7151,7 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
diff --git a/po/de.po b/po/de.po
index 00075b38d..cab05349a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.9.90\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 2006-09-25 09:09+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -83,8 +83,8 @@ msgstr "'%s' kann nicht erzeugt werden: %s\n"
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
@@ -195,13 +195,13 @@ msgid "run in daemon mode (background)"
 msgstr "Im Daemon Modus ausführen"
 
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
@@ -225,7 +225,7 @@ msgstr "Im Vordergrund laufen lassen"
 msgid "do not grab keyboard and mouse"
 msgstr "Tastatur und Maus nicht \"grabben\""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 msgid "use a log file for the server"
 msgstr "Logausgaben in eine Datei umlenken"
@@ -279,13 +279,13 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr "|DATEI|Schreibe die Umgebungsvariabeln auf DATEI"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid "Please report bugs to <"
 msgstr "Fehlerberichte bitte an <"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ">.\n"
@@ -312,31 +312,31 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ungültige Debugebene `%s' angegeben\n"
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, 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"
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
 #: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
@@ -576,7 +576,7 @@ msgstr "Korrekt"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -585,53 +585,53 @@ msgstr ""
 "Wenn Sie vollständiges Vertrauen haben, daß%%0A  \"%s\"%%"
 "0ABenutzerzertifikate verläßlich zertifiziert, so antworten Sie mit \"Ja\""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr "Nein"
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "Fehler beim Erzeugen einer \"Pipe\": %s\n"
 
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr ""
 "Das Erstellen eines Speicherabzugs (core-dump) kann nicht verhindert werden: "
 "%s\n"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "Fehler beim \"Forken\" des Prozess: %s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, fuzzy, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 "Das Warten auf die Beendigung des protect-tools ist fehlgeschlagen: %s\n"
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "Fehler beim Holen der gespeicherten Flags: %s\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "Fehler bei Ausführung von `%s': Endestatus %d\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr "Feler bei Ausführung von `%s': wahrscheinlich nicht installiert\n"
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "Fehler bei Ausführung von `%s': Endestatus %d\n"
@@ -1446,7 +1446,7 @@ msgstr ""
 "Schlüssel %08lX: geheimer Schlüssel, aber ohne öffentlichen Schlüssel - "
 "übersprungen\n"
 
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1462,27 +1462,27 @@ msgstr "|[Datei]|Eine Unterschrift erzeugen"
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "Daten verschlüsseln"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschlüsseln"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "Daten entschlüsseln (Voreinstellung)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "Signatur prüfen"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "Liste der Schlüssel"
 
@@ -1494,15 +1494,15 @@ msgstr "Liste der Schlüssel und ihrer Signaturen"
 msgid "list and check key signatures"
 msgstr "Signaturen der Schlüssel auflisten und prüfen"
 
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "Liste der geheimen Schlüssel"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "Ein neues Schlüsselpaar erzeugen"
 
@@ -1534,11 +1534,11 @@ msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
 msgid "export keys"
 msgstr "Schlüssel exportieren"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "Schlüssel zu einem Schlü.server exportieren"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "Schlüssel von einem Schlü.server importieren"
 
@@ -1574,7 +1574,7 @@ msgstr "Ändern der \"Trust\"-Datenbank"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests für die Dateien ausgeben"
 
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1585,31 +1585,31 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-Hülle versehen"
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschlüsseln für NAME"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "Keine wirklichen Änderungen durchführen"
 
@@ -1625,7 +1625,7 @@ msgstr "OpenPGP-Verhalten strikt beachten"
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x-kompatibele Botschaften erzeugen"
 
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1634,7 +1634,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollständige Liste aller Kommandos und "
 "Optionen)\n"
 
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1674,7 +1674,7 @@ msgstr ""
 "Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
 "Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
 
-#: g10/gpg.c:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1702,7 +1702,7 @@ msgstr "Komprimierung: "
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Befehle\n"
 
@@ -1965,7 +1965,7 @@ msgstr "%s:%d: ungültige Überprüfuns-Option.\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
 
@@ -2013,11 +2013,11 @@ msgstr ""
 "Verschlüssen einer Botschaft benötigt im --pgp2-Modus die IDEA-"
 "Verschlüsselung\n"
 
-#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
@@ -2253,7 +2253,7 @@ msgstr "Schlüssel aus diesem Schlüsselbund nehmen"
 msgid "make timestamp conflicts only a warning"
 msgstr "differierende Zeitangaben sind kein Fehler"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
@@ -6547,62 +6547,62 @@ msgstr ""
 msgid "the NullPIN has not yet been changed\n"
 msgstr "Die Nullpin wurde noch nicht geändert\n"
 
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "Der Fingerabdruck kann nicht gespeichert werden: %s\n"
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "Das Erzeugungsdatum konnte nicht gespeichert werden: %s\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "Lesen des öffentlichen Schlüssels fehlgeschlagen: %s\n"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr "Die Antwort enthält keine öffentliche Schlüssel-Daten\n"
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr "Die Antwort enthält das RSA-Modulus nicht\n"
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr "Antwort enthält den öffentlichen RSA-Exponenten nicht\n"
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-Callback meldete Fehler: %s\n"
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN für CHV%d ist zu kurz; die Mindestlänge beträgt %d\n"
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n"
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr "Fehler beim Holen des CHV-Status' von der Karte\n"
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr "Karte ist dauerhaft gesperrt!\n"
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "Noch %d Admin-PIN-Versuche, bis die Karte dauerhaft geperrt ist\n"
@@ -6610,110 +6610,110 @@ msgstr "Noch %d Admin-PIN-Versuche, bis die Karte dauerhaft geperrt ist\n"
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr "|A|Admin-PIN"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Neue Admin-PIN"
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|N|New PIN"
 msgstr "|N|Neue PIN"
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Fehler beim Abfragen einer neuen PIN: %s\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 msgid "error reading application data\n"
 msgstr "Fehler beim Lesen der Anwendungsdaten\n"
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 msgid "error reading fingerprint DO\n"
 msgstr "Fehler beim Lesen des Fingerabdrucks DO\n"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 msgid "key already exists\n"
 msgstr "Schlüssel existiert bereits\n"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr "Existierender Schlüssel wird ersetzt werden\n"
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 msgid "generating new key\n"
 msgstr "neue Schlüssel werden erzeugt\n"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr "Erzeugungsdatum fehlt\n"
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "Der RSA Modulus fehlt oder ist nicht %d Bits lang\n"
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "der öffentliche Exponent fehlt oder ist zu groß (mehr als %d Bit)\n"
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "Die RSA Primzahl %s fehlt oder ist nicht %d Bits lang\n"
 
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "Speichern des Schlüssels fehlgeschlagen: %s\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr "Bitte warten, der Schlüssel wird erzeugt ...\n"
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 msgid "generating key failed\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen\n"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Schlüsselerzeugung abgeschlossen (%d Sekunden)\n"
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "Ungültige Struktur der OpenPGP-Karte (DO 0x93)}\n"
 
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Die Hashmethode %s wird von der Karte nicht unterstützt\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "Anzahl bereits erzeugter Signaturen: %lu\n"
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Bitte die PIN eingeben%%0A[Sigs erzeugt: %lu]"
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "Die Überprüfung der Admin PIN is momentan durch ein Kommando verboten "
 "worden\n"
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
@@ -6722,7 +6722,7 @@ msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
 msgid "run in multi server mode (foreground)"
 msgstr "Im Multiserver Modus ausführen"
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 msgid "read options from file"
 msgstr "Konfigurationsoptionen aus Datei lesen"
 
@@ -6803,126 +6803,134 @@ msgstr ""
 "Verbindung zum Dirmngr kann nicht aufgebaut werden - Ersatzmethode wird "
 "versucht\n"
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "Die kritische Zertifikaterweiterung %s wird nicht unterstützt"
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr "Das Herausgeberzertifikat ist nicht für eine CA gekennzeichnet"
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr "kritische Richtlinie ohne konfigurierte Richtlinien"
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "Datei `%s' kann nicht geöffnet werden: %s\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr "Notiz: Die unkritische Zertifikatrichtlinie ist nicht erlaubt"
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 msgid "certificate policy not allowed"
 msgstr "Die Zertifikatrichtlinie ist nicht erlaubt"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr "Der Herausgeber wird von einer externen Stelle gesucht\n"
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "Anzahl der übereinstimmenden Heruasgeber: %d\n"
 
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 msgid "failed to allocated keyDB handle\n"
 msgstr "Ein keyDB Handle konnte nicht bereitgestellt werden\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 msgid "certificate has been revoked"
 msgstr "Das Zertifikat wurde widerrufen"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 msgid "no CRL found for certificate"
 msgstr "Keine CRL für das Zertifikat gefunden"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 msgid "the available CRL is too old"
 msgstr "Die vorhandene CRL ist zu alt"
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 "Bitte vergewissern Sie sich das der \"dirmngr\" richtig installierrt ist\n"
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Die CRL konnte nicht geprüft werden: %s"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 msgid "no issuer found in certificate"
 msgstr "Im Zertifikat ist kein Herausgeber enthalten"
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "Zertifikat mit unzulässiger Gültigkeit: %s"
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 msgid "certificate not yet valid"
 msgstr "Das Zertifikat ist noch nicht gültig"
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 msgid "certificate has expired"
 msgstr "Das Zertifikat ist abgelaufen"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr "Das eigenbeglaubigte Zertifikat hat eine FALSCHE Signatur"
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 msgid "root certificate is not marked trusted"
 msgstr "Das Wurzelzertifikat ist nicht als vertrauenswürdig markiert"
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "Fingerprint=%s\n"
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 msgid "root certificate has now been marked as trusted\n"
 msgstr "Das Wurzelzertifikat wurde nun als vertrauenswürdig markiert\n"
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Fehler beim Prüfen der vertrauenswürdigen Zertifikate: %s\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr "Der Zertifikatkette ist zu lang\n"
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 msgid "issuer certificate not found"
 msgstr "Herausgeberzertifikat nicht gefunden"
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 msgid "certificate has a BAD signature"
 msgstr "Das Zertifikat hat eine FALSCHE Signatur"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 "Eine anderes möglicherweise passendes CA-Zertifikat gefunden - versuche "
 "nochmal"
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "Die Zertifikatkette ist länger als von der CA erlaubt (%d)"
@@ -6931,7 +6939,7 @@ msgstr "Die Zertifikatkette ist länger als von der CA erlaubt (%d)"
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA benötigt einen 160-bit Hash Algorithmus\n"
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(Dies ist der MD2 Algorithmus)\n"
 
@@ -7008,42 +7016,47 @@ msgstr "Das Zertifikat kann nicht zum Verschlüsseln benutzt werden\n"
 msgid "certificate is not usable for signing\n"
 msgstr "Das Zertifikat kann nicht zum Signieren benutzt werden\n"
 
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr ""
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr ""
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "Die \"Keybox\" `%s' konnte nicht erstellt werden: %s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "Die \"Keybox\" `%s' konnte nicht erstellt werden: %s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "Schlüsselerzeugung vollendet (%d Sekunden)\n"
@@ -7095,177 +7108,177 @@ msgstr "Fehler beim Erstellen einer temporären Datei: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "Fehler beim Schreiben auf eine temporäre Datei: %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "|[FILE]|make a signature"
 msgstr "|[DATEI]|Erzeuge eine Signatur"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[DATEI]|Erzeuge eine Klartextsignatur"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 msgid "list external keys"
 msgstr "Externe Schlüssel anzeigen"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 msgid "list certificate chain"
 msgstr "Schlüssel mit Zertifikatekette anzeigen"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 msgid "remove key from the public keyring"
 msgstr "Schlüssel aus dem öffentlichen Schlüsselbund löschen"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 msgid "import certificates"
 msgstr "Zertifikate importieren"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "export certificates"
 msgstr "Zertifikate exportieren"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr "Smartcard registrieren"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr "Im Server Modus ausführen"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr "Das Kommand an den Dirmngr durchreichen"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr "Rufe das gpg-protect-tool auf"
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "change a passphrase"
 msgstr "Das Mantra (Passphrase) ändern"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 msgid "create base-64 encoded output"
 msgstr "Ausgabe im Basis-64 format erzeugen"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr "Eingabedaten sind im PEM Format"
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr "Eingabedaten sind im Basis-64 Format"
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr "Eingabedaten sind im Binärformat"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr "Benutze den System Dirmngr when verfügbar"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr "Niemals eine CRL konsultieren"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr "Die Gültigkeit mittels OCSP prüfen"
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr "|N|Sende N Zertifikate mit"
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr "|DATEI|Richtlinieninformationen DATEI entnehmen"
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr "Zertikikatrichtlinien nicht überprüfen"
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr "Fehlende Zertifikate automatisch holen"
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|NAME als voreingestellten Empfänger benutzen"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 msgid "use the default key as default recipient"
 msgstr ""
 "Den Standardschlüssel als voreingestellten\n"
 "Empfänger benutzen"
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr "Beim Verschlüsseln ein Siegel (MDC) verwenden"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "add this keyring to the list of keyrings"
 msgstr "Als öffentlichen Schlüsselbund mitbenutzen"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schlüsselbund mitbenutzen"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|Schlüssel bei diesem Server nachschlagen"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Terminalzeichensatz NAME benutzen"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NAME|Die Debugstufe auf NAME setzen"
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr "|DATEI|Erweiterungsmodul DATEI laden"
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschl.verfahren NAME benutzen"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 msgid "|N|use compress algorithm N"
 msgstr "|N|Komprimierverfahren N benutzen"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Gebrauch: gpgsm [Optionen] [Dateien] (-h für Hilfe)"
 
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:521
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7274,35 +7287,35 @@ msgstr ""
 "Gebrauch: gpgsm [Optionen] [Dateien]\n"
 "Signieren, prüfen, ver- und entschlüsseln mittels S/MIME protocol\n"
 
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:615
 msgid "usage: gpgsm [options] "
 msgstr "Gebrauch: gpgsm [Optionen] "
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "Verschlüsseln für `%s' nicht möglich: %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr "Die Bibliothek Libksba is nicht aktuell (benötige %s, habe %s)\n"
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "Fehler beim Importieren des Zertifikats: %s\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "Signieren mit `%s' nicht möglich: %s\n"
 
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr "Dieses Kommando wurde noch nicht implementiert\n"
 
@@ -7432,7 +7445,7 @@ msgstr ""
 "zu erzeugen. Bitte beachten Sie, daß dies KEINE qualifizierte\n"
 "Signatur erzeugen wird."
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Prüfung auf ein qualifiziertes Zertifikats fehlgeschlagen: %s\n"
diff --git a/po/el.po b/po/el.po
index 15f8a53b6..179bb4b88 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 2003-06-27 12:00+0200\n"
 "Last-Translator: Dokianakis Theofanis <[email protected]>\n"
 "Language-Team: Greek <[email protected]>\n"
@@ -84,8 +84,8 @@ msgstr "�������� ����������� ��� `%s': %s\n"
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
@@ -198,13 +198,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "���������"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "����� ������"
 
@@ -229,7 +229,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 #, fuzzy
 msgid "use a log file for the server"
@@ -288,14 +288,14 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "��������� �� ���������� ��� <[email protected]>\n"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ""
@@ -321,30 +321,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
 #: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
@@ -577,58 +577,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 #, fuzzy
 msgid "Yes"
 msgstr "���|���"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "�������� ��������� ��� �������: %s\n"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@ -1477,7 +1477,7 @@ msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
 
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1493,27 +1493,27 @@ msgstr "|[������]|���������� ���� ���������"
 msgid "|[file]|make a clear text signature"
 msgstr "|[������]|���������� ���� �� ���������������� ���������"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "���������� ���� �� ������������� ���������"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "������������� ���������"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "������������� �� ����� ���� ����������� ����������"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "���������������� ��������� (��������������)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "���������� ���� ���������"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "���������� ��� ������ ��������"
 
@@ -1526,15 +1526,15 @@ msgstr "���������� ��� ������ �������� ��� ���������"
 msgid "list and check key signatures"
 msgstr "������� ��������� ��������"
 
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "���������� ��� ������ �������� ��������"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "���������� ���� ���� ������� ��������"
 
@@ -1566,11 +1566,11 @@ msgstr "���������� ���� �������������� ���������"
 msgid "export keys"
 msgstr "������� ��������"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "������� �������� �� ��� ���������� ��������"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "�������� �������� ��� ��� ���������� ��������"
 
@@ -1606,7 +1606,7 @@ msgstr "�������� ��� ����� ��������� ������������"
 msgid "|algo [files]|print message digests"
 msgstr "|����� [������]| ���������� ���������� ��� ���������"
 
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1617,31 +1617,31 @@ msgstr ""
 "��������:\n"
 " "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr "���������� ascii ������������ ������"
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|�����|������������� ��� �����"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���������� �������� ��������� N (0 �������������)"
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr "����� ��������� ���������� ��������"
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "����� �� ������� ������"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "�� �� ����� ������ ������"
 
@@ -1657,7 +1657,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1665,7 +1665,7 @@ msgstr ""
 "@\n"
 "(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
 
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1703,7 +1703,7 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: g10/gpg.c:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1731,7 +1731,7 @@ msgstr "��������: "
 msgid "usage: gpg [options] "
 msgstr "�����: gpg [��������] "
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "������������� �������\n"
 
@@ -1995,7 +1995,7 @@ msgstr "%s:%d: �� ������� �������� ��������\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
@@ -2039,11 +2039,11 @@ msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
@@ -2282,7 +2282,7 @@ msgstr "������� ��� �������� ��� ���� �� ����������"
 msgid "make timestamp conflicts only a warning"
 msgstr "������� ��� ����������� ���� (timestamp) ���� ��� �������������"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr "|FD|������� ��� ����������� ���������� ��� FD"
 
@@ -6529,62 +6529,62 @@ msgstr ""
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "�������� ������������ ��� cache �����������: %s\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6592,113 +6592,113 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' ��� �����������\n"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 #, fuzzy
 msgid "generating new key\n"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
@@ -6707,7 +6707,7 @@ msgstr "�� �������� ������ OpenPGP ��������.\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 #, fuzzy
 msgid "read options from file"
 msgstr "�������� �������� ��� `%s'\n"
@@ -6789,131 +6789,139 @@ msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "��������: �� ������ ���� ���������"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "���� �������������"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "������ ��������� ���: "
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "���������� ���� �������������� ���������"
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 #, fuzzy
 msgid "certificate has expired"
 msgstr "���� �� ������ ���� �����!"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "���������� ��� fingerprint"
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "���������� ���� ���������"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6922,7 +6930,7 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "� DSA ������� �� ����� ���� 160 bit ���������� hash\n"
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6999,42 +7007,47 @@ msgstr ""
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "�� ������ ��������� Email\n"
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "�������� ����������� ��� ����������� `%s': %s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "�������� ����������� ��� ����������� `%s': %s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
@@ -7087,185 +7100,185 @@ msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "������� ���  `%s'\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[������]|���������� ���� ���������"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[������]|���������� ���� �� ���������������� ���������"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "���������� ��� ������ �������� ��������"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "���� �������������"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "���� �������������"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "���� �������������"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "������ ��� ������ ������"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "���������� ascii ������������ ������"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 msgid "|NAME|use NAME as default recipient"
 msgstr "|�����|����� ��� �������� �� ��������������� ���������"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 msgid "use the default key as default recipient"
 msgstr "����� ��� ��������������� �������� �� ��������������� ���������"
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr "�� ����� ����������"
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 msgid "force v3 signatures"
 msgstr "������������ ������ v3 ���������"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr "����� ������� MDC ��� �������������"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr "��������� batch: �� �� �������� ���������"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr "�������� ��� ���� ������������ ���������"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr "�������� ��� ���� ������������ ���������"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "add this keyring to the list of keyrings"
 msgstr "�������� ����� ��� �������� ��� ����� ��� �����������"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "add this secret keyring to the list"
 msgstr "�������� ����� ��� �������� ����������� ��� �����"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr "|�����|����� �������� ��� �������������� ������� ������"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|�����������|����� ����� ��� ���������� �������� ��� ���������"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|�����|���������� ��� ��� ���������� ���������� �� �����"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr "|������|������� ��� ���������� ��������� ������"
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|�����|����� ���������� �������������� �����"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|�����|����� ���������� ��������� ��������� ����� "
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 msgid "|N|use compress algorithm N"
 msgstr "|N|����� ���������� ��������� N"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:521
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7276,36 +7289,36 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:615
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "�����: gpg [��������] "
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "������� ���  `%s'\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7426,7 +7439,7 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
diff --git a/po/eo.po b/po/eo.po
index 5d1ab5703..9122a24a9 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
 "Language-Team: Esperanto <[email protected]>\n"
@@ -84,8 +84,8 @@ msgstr "ne povas krei '%s': %s\n"
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
@@ -199,13 +199,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "detala eligo"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
@@ -230,7 +230,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 #, fuzzy
 msgid "use a log file for the server"
@@ -288,14 +288,14 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ""
@@ -321,30 +321,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
 #: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
@@ -577,58 +577,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 #, fuzzy
 msgid "Yes"
 msgstr "jes"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -1461,7 +1461,7 @@ msgstr "uzas flankan �losilon %08lX anstata� la �efa �losilo %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1477,27 +1477,27 @@ msgstr "|[dosiero]|fari subskribon"
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "listigi �losilojn"
 
@@ -1510,15 +1510,15 @@ msgstr "listigi �losilojn kaj subskribojn"
 msgid "list and check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
@@ -1550,11 +1550,11 @@ msgstr "krei revokatestilon"
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
@@ -1590,7 +1590,7 @@ msgstr "aktualigi la fido-datenaron"
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1601,31 +1601,31 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
@@ -1641,7 +1641,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1649,7 +1649,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1687,7 +1687,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/gpg.c:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1716,7 +1716,7 @@ msgstr "Komento: "
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
@@ -1977,7 +1977,7 @@ msgstr "AVERTO: '%s' estas malplena dosiero\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
@@ -2017,11 +2017,11 @@ msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n"
 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:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
@@ -2263,7 +2263,7 @@ msgstr "�u forvi�i �i tiun �losilon de la �losilaro? "
 msgid "make timestamp conflicts only a warning"
 msgstr "malkongruo de tempostampoj"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
@@ -6464,62 +6464,62 @@ msgstr ""
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6527,113 +6527,113 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "eraro dum legado de �losilbloko: %s\n"
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 #, fuzzy
 msgid "key already exists\n"
 msgstr "'%s' jam densigita\n"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 #, fuzzy
 msgid "generating new key\n"
 msgstr "krei novan �losilparon"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
@@ -6642,7 +6642,7 @@ msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 #, fuzzy
 msgid "read options from file"
 msgstr "legas opciojn el '%s'\n"
@@ -6724,140 +6724,148 @@ msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "�losilo %08lX: �losilo estas revokita!\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Bona atestilo"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Nenia helpo disponata"
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Bona atestilo"
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "problemo �e legado de atestilo: %s\n"
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 #, fuzzy
 msgid "certificate not yet valid"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 #, fuzzy
 msgid "certificate has expired"
 msgstr "problemo �e legado de atestilo: %s\n"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 #, fuzzy
 msgid "root certificate is not marked trusted"
 msgstr ""
 "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
 "\n"
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Fingrospuro:"
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 #, fuzzy
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
 "\n"
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "kontroli subskribon"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6866,7 +6874,7 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr ""
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6942,42 +6950,47 @@ msgstr ""
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "eraro dum kreado de �losilaro '%s': %s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
@@ -7030,185 +7043,185 @@ msgstr "eraro dum kreado de pasfrazo: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "skribas al '%s'\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Valida atestilrevoko"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "forigi �losilojn de la publika �losilaro"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "Bona atestilo"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "Bona atestilo"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "krei eligon en askia kiraso"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 msgid "use the default key as default recipient"
 msgstr "uzi la implicitan �losilon kiel implicitan ricevonton"
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr "tute ne uzi la terminalon"
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 msgid "force v3 signatures"
 msgstr "devigi v3-subskribojn"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr "�iam uzi sigelon (MDC) por �ifrado"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr "neinteraga re�imo: neniam demandi"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr "supozi \"jes\" �e la plej multaj demandoj"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr "supozi \"ne\" �e la plej multaj demandoj"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "add this keyring to the list of keyrings"
 msgstr "aldoni �i tiun �losilaron al la listo de �losilaroj"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "add this secret keyring to the list"
 msgstr "aldoni �i tiun sekretan �losilaron al la listo"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVILO|uzi �i tiun �losilservilon por ser�i �losilojn"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMO|uzi kompendi-metodon NOMO"
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 msgid "|N|use compress algorithm N"
 msgstr "|N|uzi densig-metodon N"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:521
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7219,36 +7232,36 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:615
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7369,7 +7382,7 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
diff --git a/po/es.po b/po/es.po
index bee800718..31a4e393a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 2005-03-25 16:50+0100\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -106,8 +106,8 @@ msgstr "no se puede crear %s: %s\n"
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
@@ -220,13 +220,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "prolijo"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
@@ -251,7 +251,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 #, fuzzy
 msgid "use a log file for the server"
@@ -309,14 +309,14 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ""
@@ -342,30 +342,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, 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:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
@@ -608,58 +608,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 #, fuzzy
 msgid "Yes"
 msgstr "s�"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "no puede abrirse el fichero: %s\n"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "error obteniendo la informaci�n actual de la clave: %s\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "error leyendo `%s': %s\n"
@@ -1470,7 +1470,7 @@ msgstr "clave %s: clave secreta sin clave p�blica - omitida\n"
 # S�, este no he podido ser yo :-) Por cierto, �por qu� la O no se
 # puede acentuar? �demasiado alta?
 # �Qui�n dice que no se puede? :-)
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1486,27 +1486,27 @@ msgstr "|[file]|crea una firma"
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|crea una firma en texto claro"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "lista claves"
 
@@ -1518,15 +1518,15 @@ msgstr "lista claves y firmas"
 msgid "list and check key signatures"
 msgstr "lista y comprueba firmas de las claves"
 
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
@@ -1558,11 +1558,11 @@ msgstr "genera un certificado de revocaci�n"
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
@@ -1598,7 +1598,7 @@ msgstr "actualiza la base de datos de confianza"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1609,31 +1609,31 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 no comprime)"
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
@@ -1653,7 +1653,7 @@ msgstr "generar mensajes compatibles con PGP 2.x"
 # p�gina man -> p�gina de manual
 # Vale. �del manual mejor?
 # Hmm, no s�, en man-db se usa "de". La verdad es que no lo he pensado.
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1661,7 +1661,7 @@ msgstr ""
 "@\n"
 "(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
 
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1699,7 +1699,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: g10/gpg.c:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1727,7 +1727,7 @@ msgstr "Compresi�n: "
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "�rdenes incompatibles\n"
 
@@ -1988,7 +1988,7 @@ msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
@@ -2028,11 +2028,11 @@ msgstr "debe usar ficheros (no tuber�as) si trabaja con --pgp2 activo.\n"
 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:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
@@ -2268,7 +2268,7 @@ msgstr "tomar las claves de este anillo"
 msgid "make timestamp conflicts only a warning"
 msgstr "hacer que los conflictos de fecha-hora sean s�lo un aviso"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaci�n de estado en este descriptor de fichero"
 
@@ -6386,62 +6386,62 @@ msgstr ""
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "fallo al almacenar la huella digital: %s\n"
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "fallo guardando la fecha de creaci�n: %s\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fallo leyendo la clave\n"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr "la respuesta no incluye la clave p�blica\n"
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr "la respuesta no incluye el m�dulo RSA\n"
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr "la respuesta no incluye el exponente p�blico RSA\n"
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "la funci�n de manejo del PIN devolvi� un error: %s\n"
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "El PIN para CHV%d es demasiado corto; longitud m�nima %d\n"
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la verificaci�n CHV%d fall�: %s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr "el acceso a �rdenes de administrador no est� configurado\n"
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr "error recuperando el estatus CHV de la tarjeta\n"
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr "�la tarjeta est� bloqueada permanentemente!\n"
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6451,108 +6451,108 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr "|A|PIN Administrador"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nuevo PIN Administrador"
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|N|New PIN"
 msgstr "|N|Nuevo PIN"
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error obteniendo nuevo PIN: %s\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 msgid "error reading application data\n"
 msgstr "error leyendo datos de la aplicaci�n\n"
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 msgid "error reading fingerprint DO\n"
 msgstr "error leyendo huella digital DO\n"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 msgid "key already exists\n"
 msgstr "la clave ya existe\n"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr "la clave existente ser� reemplazada\n"
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 msgid "generating new key\n"
 msgstr "generando nueva clave\n"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, fuzzy, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "exponente p�blico demasiado grande (m�s de 32 bits)\n"
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "fallo al almacenar la clave: %s\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr "por favor, espere mientras se genera la clave ...\n"
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 msgid "generating key failed\n"
 msgstr "la generaci�n de la clave fall�\n"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generaci�n de clave completada (%d segundos)\n"
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "estructura de la tarjeta OpenPGP inv�lida (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "firma %s, algoritmo de resumen %s\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "firmas creadas hasta ahora: %lu\n"
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, fuzzy, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "PIN [firmas hechas: %lu]"
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "no se puede acceder a %s - �tarjeta OpenPGP inv�lida?\n"
@@ -6561,7 +6561,7 @@ msgstr "no se puede acceder a %s - �tarjeta OpenPGP inv�lida?\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 #, fuzzy
 msgid "read options from file"
 msgstr "leyendo opciones desde `%s'\n"
@@ -6643,140 +6643,148 @@ msgstr "el programa no permite usar el protocolo agente gpg versi�n %d\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "el programa no permite usar el protocolo agente gpg versi�n %d\n"
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "No se puede abrir `%s': %s\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "no se permite exportar claves secretas\n"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "fallo al almacenar la clave: %s\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: la clave ha sido revocada"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Certificado correcto"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Clave disponible en: "
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "la comprobaci�n de la firma creada fall�: %s\n"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Certificado correcto"
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "problema en la lectura del certificado: %s\n"
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 #, fuzzy
 msgid "certificate not yet valid"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 #, fuzzy
 msgid "certificate has expired"
 msgstr "problema en la lectura del certificado: %s\n"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 #, fuzzy
 msgid "root certificate is not marked trusted"
 msgstr ""
 "No se ha encontrado ning�n certificado sin valor de confianza.\n"
 "\n"
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Huella dactilar CA:"
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 #, fuzzy
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "No se ha encontrado ning�n certificado sin valor de confianza.\n"
 "\n"
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "la comprobaci�n de la firma creada fall�: %s\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifica una firma"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6785,7 +6793,7 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA necesita un algoritmo de hash de 160 bits.\n"
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6861,42 +6869,47 @@ msgstr ""
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Direcci�n inv�lida\n"
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "error escribiendo anillo `%s': %s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
@@ -6949,129 +6962,129 @@ msgstr "error creando frase contrase�a: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[file]|crea una firma"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[file]|crea una firma en texto claro"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "lista claves secretas"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "elimina claves del anillo p�blico"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "register a smartcard"
 msgstr "a�adir clave a tarjeta"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crea una salida ascii con armadura"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 msgid "use the default key as default recipient"
 msgstr "usa la clave por defecto como destinatario"
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr "no usa la terminal en absoluto"
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr "siempre usa un MDC para cifrar"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
@@ -7081,60 +7094,60 @@ msgstr "proceso por lotes: nunca preguntar"
 # Adem�s una de las acepciones de asumir es "aceptar algo" y suponer
 # viene a ser asumir una idea como propia. Suponer "s�" en casi todas las
 # preguntas no me acaba de gustar.
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr "asume \"s�\" en casi todas las preguntas"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "add this keyring to the list of keyrings"
 msgstr "a�ade este anillo a la lista de anillos"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "add this secret keyring to the list"
 msgstr "a�ade este anillo secreto a la lista"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVIDOR|usa este servidor de claves"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa el algoritmo de compresi�n N"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpgm [opciones] [ficheros] (-h para ayuda)"
 
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:521
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7145,36 +7158,36 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:615
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpgm [opciones] "
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "no se puede conectar con `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "no se puede acceder a `%s': %s\n"
 
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7295,7 +7308,7 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "la comprobaci�n de la firma creada fall�: %s\n"
diff --git a/po/et.po b/po/et.po
index 90e59e460..76bc7e0c5 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
@@ -84,8 +84,8 @@ msgstr "`%s' ei �nnestu luua: %s\n"
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
@@ -198,13 +198,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "ole jutukas"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "ole m�nev�rra vaiksem"
 
@@ -229,7 +229,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 #, fuzzy
 msgid "use a log file for the server"
@@ -287,14 +287,14 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ""
@@ -320,30 +320,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
 #: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
@@ -576,58 +576,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 #, fuzzy
 msgid "Yes"
 msgstr "jah"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "faili ei �nnestu avada: %s\n"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -1468,7 +1468,7 @@ msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti avaliku v�tmeta - j�tsin vahele\n"
 
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1484,27 +1484,27 @@ msgstr "|[fail]|loo allkiri"
 msgid "|[file]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "kr�pteeri andmed"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "dekr�pteeri andmed (vaikimisi)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "n�ita v�tmeid"
 
@@ -1517,15 +1517,15 @@ msgstr "n�ita v�tmeid ja allkirju"
 msgid "list and check key signatures"
 msgstr "kontrolli v�tmete allkirju"
 
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "n�ita v�tmeid ja s�rmej�lgi"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "n�ita salajasi v�tmeid"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "genereeri uus v�tmepaar"
 
@@ -1557,11 +1557,11 @@ msgstr "genereeri t�histamise sertifikaat"
 msgid "export keys"
 msgstr "ekspordi v�tmed"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "ekspordi v�tmed v�tmeserverisse"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "impordi v�tmed v�tmeserverist"
 
@@ -1597,7 +1597,7 @@ msgstr "uuenda usalduse andmebaasi"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [failid]|tr�ki teatel�hendid"
 
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1608,31 +1608,31 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|kr�pti NIMEle"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "kasuta v�ljundfailina"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "�ra tee mingeid muutusi"
 
@@ -1648,7 +1648,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1656,7 +1656,7 @@ msgstr ""
 "@\n"
 "(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
 
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1694,7 +1694,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/gpg.c:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1722,7 +1722,7 @@ msgstr "Pakkimine: "
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "vastuolulised k�sud\n"
 
@@ -1981,7 +1981,7 @@ msgstr "%s:%d: vigased ekspordi v�tmed\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
@@ -2022,11 +2022,11 @@ msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n"
 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:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
@@ -2260,7 +2260,7 @@ msgstr "v�ta v�tmed sellest v�tmehoidlast"
 msgid "make timestamp conflicts only a warning"
 msgstr "teata ajatemplite konfliktist ainult hoiatusega"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
@@ -6433,62 +6433,62 @@ msgstr ""
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6496,113 +6496,113 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "viga v�tmebloki lugemisel: %s\n"
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genereeri uus v�tmepaar"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ei leia OpenPGP andmeid.\n"
@@ -6611,7 +6611,7 @@ msgstr "ei leia OpenPGP andmeid.\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 #, fuzzy
 msgid "read options from file"
 msgstr "loen v�tmeid failist `%s'\n"
@@ -6693,131 +6693,139 @@ msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "M�RKUS: v�ti on t�histatud"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "halb sertifikaat"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "V�tme leiate: "
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "genereeri t�histamise sertifikaat"
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 #, fuzzy
 msgid "certificate has expired"
 msgstr "See v�ti on aegunud!"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "n�ita s�rmej�lge"
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "kontrolli allkirja"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6826,7 +6834,7 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA n�uab 160 bitist r�sialgoritmi kasutamist\n"
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6902,42 +6910,47 @@ msgstr ""
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
@@ -6990,185 +7003,185 @@ msgstr "viga parooli loomisel: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[fail]|loo allkiri"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "n�ita salajasi v�tmeid"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "eemalda v�tmed avalike v�tmete hoidlast"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muuda parooli"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 msgid "use the default key as default recipient"
 msgstr "kasuta vaikimisi saajana vaikimisi v�tit"
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr "�ra kasuta terminali"
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 msgid "force v3 signatures"
 msgstr "kasuta v3 allkirju"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr "kr�ptimisel kasuta alati MDC"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr "pakettmood: �ra k�si kunagi"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr "eelda enamus k�simustele jah vastust"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr "eelda enamus k�simustele ei vastust"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "add this keyring to the list of keyrings"
 msgstr "lisa see v�tmehoidla v�tmehoidlate nimekirja"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "add this secret keyring to the list"
 msgstr "lisa see salajaste v�tmete hoidla nimekirja"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|kasuta seda v�tmeserverit"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NIMI|terminali kooditabel on NIMI"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|kasuta �ifri algoritmi NIMI"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|kasuta teatel�hendi algoritmi NIMI"
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 msgid "|N|use compress algorithm N"
 msgstr "|N|kasuta pakkimisalgoritmi N"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:521
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7179,36 +7192,36 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:615
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "`%s' ei �nnestu sulgeda: %s\n"
 
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7329,7 +7342,7 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
diff --git a/po/fi.po b/po/fi.po
index bec5815c2..3eeaee048 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <[email protected]>\n"
 "Language-Team: Finnish <[email protected]>\n"
@@ -100,8 +100,8 @@ msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
@@ -214,13 +214,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "monisanainen"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "ole jonkinverran hiljaisempi"
 
@@ -245,7 +245,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 #, fuzzy
 msgid "use a log file for the server"
@@ -303,7 +303,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 #, fuzzy
 msgid "Please report bugs to <"
@@ -311,7 +311,7 @@ msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <[email protected]>.\n"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ""
@@ -337,30 +337,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
 #: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
@@ -593,58 +593,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 #, fuzzy
 msgid "Yes"
 msgstr "kyllä|kylla|joo"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -1487,7 +1487,7 @@ msgstr ""
 "avain %08lX: salaisella avaimella ei ole vastaavaa \n"
 "julkista avainta - ohitetaan\n"
 
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1503,27 +1503,27 @@ msgstr "|[tiedosto]|tee allekirjoitus"
 msgid "|[file]|make a clear text signature"
 msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "salaa tiedot"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "salaa vain symmetrisellä salaimella"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "avaa tiedot (oletus)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "tarkista allekirjoitus"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "näytä avaimet"
 
@@ -1536,15 +1536,15 @@ msgstr "näytä avaimet allekirjoituksineen"
 msgid "list and check key signatures"
 msgstr "tarkista avainten allekirjoitukset"
 
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "näytä avaimet sormenjälkineen"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "näytä salaiset avaimet"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "luo uusi avainpari"
 
@@ -1576,11 +1576,11 @@ msgstr "luo mitätöintivarmenne"
 msgid "export keys"
 msgstr "vie avaimia"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "vie avaimia palvelimelle"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "nouda avaimia avainpalvelimelta"
 
@@ -1616,7 +1616,7 @@ msgstr "päivitä luottamustietokanta"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1627,31 +1627,31 @@ msgstr ""
 "Valitsimet:\n"
 " "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr "käytä tekstimuotoa"
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "käytä tulostustiedostona"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "älä tee muutoksia"
 
@@ -1667,7 +1667,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1676,7 +1676,7 @@ msgstr ""
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1714,7 +1714,7 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/gpg.c:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1742,7 +1742,7 @@ msgstr "Pakkaus: "
 msgid "usage: gpg [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
@@ -2001,7 +2001,7 @@ msgstr "%s:%d: virheelliset vientivalitsimet\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
@@ -2042,11 +2042,11 @@ msgstr ""
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
@@ -2281,7 +2281,7 @@ msgstr "ota avaimet tästä avainrenkaasta"
 msgid "make timestamp conflicts only a warning"
 msgstr "käsittele aikaleimakonfliktit pelkkinä varoituksina"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
 
@@ -6511,62 +6511,62 @@ msgstr ""
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6574,114 +6574,114 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 #, fuzzy
 msgid "key already exists\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 #, fuzzy
 msgid "generating new key\n"
 msgstr "luo uusi avainpari"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
@@ -6690,7 +6690,7 @@ msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 #, fuzzy
 msgid "read options from file"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
@@ -6772,131 +6772,139 @@ msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "HUOM: avain on mitätöity!"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "virheellinen varmenne"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Avain saatavilla kohteessa: "
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Tämä avain on vanhentunut!"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "näytä sormenjälki"
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "tarkista allekirjoitus"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6905,7 +6913,7 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA vaatii 160-bittisen tiivistealgoritmin käyttöä\n"
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6981,42 +6989,47 @@ msgstr ""
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
@@ -7069,185 +7082,185 @@ msgstr "virhe luotaessa salasanaa: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[tiedosto]|tee allekirjoitus"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "näytä salaiset avaimet"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "poista avaimet julkisten avainten renkaasta"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muuta salasanaa"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 msgid "use the default key as default recipient"
 msgstr "käytä oletusavainta oletusvastaanottajana"
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr "älä käytä lainkaan päätettä"
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 msgid "force v3 signatures"
 msgstr "käytä aina v3-allekirjoituksia"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr "käytä aina MDC:tä salaamiseen"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr "eräajo: älä kysy mitään"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr "oleta myönteinen vastaust useimpiin kysymyksiin"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr "oleta kielteinen vastaust useimpiin kysymyksiin"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "add this keyring to the list of keyrings"
 msgstr "lisää tämä avainrengas avainrenkaiden luetteloon"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "add this secret keyring to the list"
 msgstr "lisää tämä salainen avainrengas luetteloon"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|PALVELIN|käytä tätä palvelinta avainten etsimiseen"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NIMI|aseta päätteen merkistöksi NIMI"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|käytä salausalgoritmia NIMI"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|käytä viestintiivistealgoritmia NIMI"
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 msgid "|N|use compress algorithm N"
 msgstr "|N|käytä pakkausalgoritmia N"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:521
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7258,36 +7271,36 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:615
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7408,7 +7421,7 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
diff --git a/po/fr.po b/po/fr.po
index d50ffb107..71c4d60f3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 2005-06-28 00:24+0200\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -89,8 +89,8 @@ msgstr "impossible de cr�er `%s': %s\n"
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
@@ -207,13 +207,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "bavard"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
@@ -238,7 +238,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 #, fuzzy
 msgid "use a log file for the server"
@@ -298,7 +298,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 #, fuzzy
 msgid "Please report bugs to <"
@@ -307,7 +307,7 @@ msgstr ""
 "et tout probl�me de traduction � <[email protected]>.\n"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ""
@@ -333,30 +333,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, 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:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
@@ -591,60 +591,60 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 #, fuzzy
 msgid "Yes"
 msgstr "oui"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr ""
 "erreur durant la lecture des informations contenues actuellement\n"
 "dans la cl�: %s\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
@@ -1472,7 +1472,7 @@ msgstr ""
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "cl� %s: cl� secr�te sans cl� publique - non prise en compte\n"
 
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1488,27 +1488,27 @@ msgstr "|[fichier]|faire une signature"
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "lister les cl�s"
 
@@ -1520,15 +1520,15 @@ msgstr "lister les cl�s et les signatures"
 msgid "list and check key signatures"
 msgstr "lister et v�rifier les signatures des cl�s"
 
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
@@ -1560,11 +1560,11 @@ msgstr "g�n�rer un certificat de r�vocation"
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
@@ -1600,7 +1600,7 @@ msgstr "mettre la base de confiance � jour"
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1611,31 +1611,31 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
@@ -1651,7 +1651,7 @@ msgstr "utiliser strictement le comportement OpenPGP"
 msgid "generate PGP 2.x compatible messages"
 msgstr "g�n�rer des messages compatibles avec PGP 2.x"
 
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1659,7 +1659,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1699,7 +1699,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:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1727,7 +1727,7 @@ msgstr "Compression: "
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
@@ -2010,7 +2010,7 @@ msgstr "%s:%d: options de v�rification invalides\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
@@ -2055,11 +2055,11 @@ 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:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
@@ -2301,7 +2301,7 @@ msgstr ""
 "faire en sorte que les conflits d'horodatage ne soient qu'un\n"
 "avertissement non fatal"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr "|FD|�crire l'�tat sur ce descripteur"
 
@@ -6542,64 +6542,64 @@ msgstr ""
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "impossible de stocker l'empreinte: %s\n"
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "impossible de stocker la date de cr�ation: %s\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "la lecture de la cl� publique a �chou�: %s\n"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr "la r�ponse ne contient pas les donn�es de cl� publique\n"
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr "la r�ponse ne contient pas le modulo RSA\n"
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr "la r�ponse ne contient pas l'exposant public RSA\n"
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "l'appel du PIN a retourn� une erreur: %s\n"
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 "Le code PIN pour CHV%d est trop court ; la longueur minimale\n"
 "est %d\n"
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la v�rification CHV%d a �chou�: %s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr "l'acc�s aux commandes d'administration n'est pas configur�\n"
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr "erreur pendant la r�cup�ration de l'�tat CHV de la carte\n"
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr "la carte est irr�m�diablement bloqu�e !\n"
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6609,112 +6609,112 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr "|A|code PIN d'administration"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nouveau code PIN d'administration"
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|N|New PIN"
 msgstr "|N|Nouveau code PIN"
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 msgid "error reading application data\n"
 msgstr "erreur pendant la lecture de donn�es d'application\n"
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 msgid "error reading fingerprint DO\n"
 msgstr "erreur pendant la lecture de l'empreinte DO\n"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 msgid "key already exists\n"
 msgstr "la cl� existe d�j�\n"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr "la cl� existante sera remplac�e\n"
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 msgid "generating new key\n"
 msgstr "g�n�rer une nouvelle cl�\n"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr "l'horodatage de cr�ation est manquant\n"
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "le module RSA est manquant ou bien sa taille n'est pas %d bits\n"
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "l'exposant public RSA est manquant ou trop �lev� (plus de %d bits)\n"
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 "le nombre premier RSA %s est manquant ou bien sa taille n'est pas\n"
 "%d bits\n"
 
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "le stockage de la cl� a �chou�: %s\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr "attendez que la cl� se g�n�re...\n"
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 msgid "generating key failed\n"
 msgstr "la g�n�ration de la cl� a �chou�\n"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "la g�n�ration de cl� a �t� effectu�e (%d secondes)\n"
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structure de carte OpenPGP invalide (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signatures cr��es jusqu'ici: %lu\n"
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "la v�rification du code PIN d'administration est actuellement interdite\n"
 "au travers de cette commande\n"
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "impossible d'acc�der � %s - carte OpenPGP invalide ?\n"
@@ -6723,7 +6723,7 @@ msgstr "impossible d'acc�der � %s - carte OpenPGP invalide ?\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 #, fuzzy
 msgid "read options from file"
 msgstr "lire les options de `%s'\n"
@@ -6802,131 +6802,139 @@ msgstr "le protocole gpg-agent version %d n'est pas support�\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "le protocole gpg-agent version %d n'est pas support�\n"
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "Impossible d'ouvrir `%s': %s\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "il est interdit d'exporter les cl� secr�tes\n"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "le stockage de la cl� a �chou�: %s\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTE: la cl� a �t� r�voqu�e"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "mauvais certificat"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Cl� disponible sur: "
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Cette cl� a expir� !"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "empreinte de l'autorit� de certification: "
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "v�rifier une signature"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6935,7 +6943,7 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA n�cessite l'utilisation d'un algorithme de hachage de 160 bits\n"
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7014,42 +7022,47 @@ msgstr ""
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "erreur durant la cr�ation du porte-cl�s `%s' : %s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "erreur durant la cr�ation du porte-cl�s `%s' : %s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "La g�n�ration de cl� a �chou�: %s\n"
@@ -7104,194 +7117,194 @@ msgstr ""
 "%s: erreur pendant l'�criture de l'enregistrement de\n"
 "r�pertoire: %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "lister les cl�s secr�tes"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "mauvais certificat"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "enlever les cl�s du porte-cl�s public"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "mauvais certificat"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "mauvais certificat"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "register a smartcard"
 msgstr "ajouter une cl� � une carte � puce"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "changer la phrase de passe"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "ignor�: la cl� publique est d�j� le destinataire par d�faut\n"
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "v�rifier les signatures"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "enlever les cl�s de ce porte-cl�s"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "Il faut la cl� secr�te pour faire cela.\n"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "algorithme de chiffrement inconnu"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "algorithme de compression inconnu"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:521
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7302,36 +7315,36 @@ 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:617
+#: sm/gpgsm.c:615
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "utilisation: gpg [options] "
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "impossible de se connecter � `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "impossible d'acc�der � `%s': %s\n"
 
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7456,7 +7469,7 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
diff --git a/po/gl.po b/po/gl.po
index 0c5eda90b..b3e2f5d36 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <[email protected]>\n"
 "Language-Team: Galician <[email protected]>\n"
@@ -84,8 +84,8 @@ msgstr "non se pode crear `%s': %s\n"
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
@@ -199,13 +199,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "lareto"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "ser un pouqui�o m�is calado"
 
@@ -230,7 +230,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 #, fuzzy
 msgid "use a log file for the server"
@@ -290,7 +290,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 #, fuzzy
 msgid "Please report bugs to <"
@@ -299,7 +299,7 @@ msgstr ""
 "e dos erros na traducci�n a <[email protected]>.\n"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ""
@@ -325,30 +325,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, 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:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
@@ -581,58 +581,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 #, fuzzy
 msgid "Yes"
 msgstr "si|sim"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "non se puido abrir un ficheiro: %s\n"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erro lendo `%s': %s\n"
@@ -1476,7 +1476,7 @@ msgstr "empr�gase a chave secundaria %08lX no canto da primaria %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sen chave p�blica - omitida\n"
 
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1492,27 +1492,27 @@ msgstr "|[ficheiro]|facer unha sinatura"
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar s� con cifrado sim�trico"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
@@ -1525,15 +1525,15 @@ msgstr "ve-la lista de chaves e sinaturas"
 msgid "list and check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
@@ -1565,11 +1565,11 @@ msgstr "xerar un certificado de revocaci�n"
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "importar chaves dun servidor de chaves"
 
@@ -1605,7 +1605,7 @@ msgstr "actualiza-la base de datos de confianza"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1616,31 +1616,31 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresi�n a N (0 desactiva)"
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "usar coma ficheiro de sa�da"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "non facer ning�n cambio"
 
@@ -1656,7 +1656,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1664,7 +1664,7 @@ msgstr ""
 "@\n"
 "(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
 
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1704,7 +1704,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: g10/gpg.c:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1732,7 +1732,7 @@ msgstr "Compresi�n: "
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
@@ -1992,7 +1992,7 @@ msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
@@ -2034,11 +2034,11 @@ msgstr ""
 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:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
@@ -2274,7 +2274,7 @@ msgstr "toma-las chaves deste chaveiro"
 msgid "make timestamp conflicts only a warning"
 msgstr "converte-los conflictos de selo de data nun aviso"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribi-la informaci�n de estado a este DF"
 
@@ -6511,62 +6511,62 @@ msgstr ""
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6574,113 +6574,113 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' xa est� comprimido\n"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 #, fuzzy
 msgid "generating new key\n"
 msgstr "xerar un novo par de chaves"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
@@ -6689,7 +6689,7 @@ msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 #, fuzzy
 msgid "read options from file"
 msgstr "lendo as opci�ns de `%s'\n"
@@ -6771,140 +6771,148 @@ msgstr "a versi�n %d do protocolo de gpg-agent non est� soportada\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "a versi�n %d do protocolo de gpg-agent non est� soportada\n"
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: a chave est� revocada"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Certificado correcto"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Chave dispo�ible en: "
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Certificado correcto"
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 #, fuzzy
 msgid "certificate not yet valid"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 #, fuzzy
 msgid "certificate has expired"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 #, fuzzy
 msgid "root certificate is not marked trusted"
 msgstr ""
 "Non se atoparon certificados con confianza non definida.\n"
 "\n"
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Pegada dactilar:"
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 #, fuzzy
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "Non se atoparon certificados con confianza non definida.\n"
 "\n"
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verificar unha sinatura"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6913,7 +6921,7 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA require o emprego dun algoritmo hash de 160 bits\n"
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6989,42 +6997,47 @@ msgstr ""
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Non � un enderezo de e-mail v�lido\n"
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "erro ao crea-lo chaveiro `%s': %s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
@@ -7077,185 +7090,185 @@ msgstr "erro ao crea-lo contrasinal: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "escribindo a `%s'\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[ficheiro]|facer unha sinatura"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "borrar chaves do chaveiro p�blico"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 msgid "use the default key as default recipient"
 msgstr "usa-la chave por defecto coma o destinatario por defecto"
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr "non usa-la terminal en absoluto"
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 msgid "force v3 signatures"
 msgstr "forzar sinaturas v3"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr "sempre usar un MDC para cifrar"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr "modo por lotes: non preguntar nunca"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr "asumir `si' na maior�a das preguntas"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr "asumir `non' na maior�a das preguntas"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "add this keyring to the list of keyrings"
 msgstr "engadir este chaveiro � lista de chaveiros"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "add this secret keyring to the list"
 msgstr "engadir este chaveiro secreto � lista"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|axusta-lo xogo de caracteres do terminal a NOME"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 msgid "|N|use compress algorithm N"
 msgstr "|N|emprega-lo algoritmo de compresi�n N"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:521
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7266,36 +7279,36 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:615
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "non se puido conectar a `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7416,7 +7429,7 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
diff --git a/po/hu.po b/po/hu.po
index 53985f162..610513d9e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 2004-06-19 21:53+0200\n"
 "Last-Translator: Nagy Ferenc L�szl� <[email protected]>\n"
 "Language-Team: Hungarian <[email protected]>\n"
@@ -84,8 +84,8 @@ msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
@@ -198,13 +198,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "b�besz�d� m�d"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "m�g sz�kszav�bb m�d"
 
@@ -229,7 +229,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 #, fuzzy
 msgid "use a log file for the server"
@@ -287,14 +287,14 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "A hib�kat (angolul) a <[email protected]> c�mre �rja meg!\n"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ""
@@ -320,30 +320,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, 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:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
@@ -576,58 +576,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 #, fuzzy
 msgid "Yes"
 msgstr "igen"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@ -1465,7 +1465,7 @@ msgstr "A %08lX m�sodlagos kulcsot haszn�ljuk a %08lX els�dleges helyett.\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "%08lX kulcs: titkos kulcs nyilv�nos kulcs n�lk�l - kihagytam.\n"
 
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1481,27 +1481,27 @@ msgstr "|[f�jl]|al��r�s k�sz�t�se"
 msgid "|[file]|make a clear text signature"
 msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "k�l�n�ll� al��r�s k�sz�t�se"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "adat titkos�t�sa"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "adat visszafejt�se (alap�rtelmez�s)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "al��r�s ellen�rz�se"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "kulcsok list�z�sa"
 
@@ -1514,15 +1514,15 @@ msgstr "kulcsok �s al��r�sok list�z�sa"
 msgid "list and check key signatures"
 msgstr "kulcsal��r�sok ellen�rz�se"
 
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "kulcsok �s ujjlenyomatok list�z�sa"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "titkos kulcsok list�z�sa"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
@@ -1554,11 +1554,11 @@ msgstr "visszavon�si igazol�s k�sz�t�se"
 msgid "export keys"
 msgstr "kulcsok export�l�sa"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "kulcsok export�l�sa kulcsszerverre"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "kulcsok import�l�sa kulcsszerverr�l"
 
@@ -1594,7 +1594,7 @@ msgstr "bizalmi adatb�zis friss�t�se"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
 
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1605,31 +1605,31 @@ msgstr ""
 "Opci�k:\n"
 " "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|N�V|titkos�t�s N�V r�sz�re"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|t�m�r�t�si szint be�ll�t�sa N-re (0: tilt�s)"
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr "kanonikus sz�veges m�d haszn�lata"
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "kimeneti �llom�ny megad�sa"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "ne csin�ljon semmi v�ltoztat�st"
 
@@ -1645,7 +1645,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1653,7 +1653,7 @@ msgstr ""
 "@\n"
 "(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
 
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1691,7 +1691,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:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1719,7 +1719,7 @@ msgstr "T�m�r�t� (compression): "
 msgid "usage: gpg [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
@@ -1978,7 +1978,7 @@ msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
 
@@ -2018,11 +2018,11 @@ msgstr "Csak �llom�nyokat (pipe-ot nem) haszn�lhat --pgp2 m�dban!\n"
 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:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
@@ -2258,7 +2258,7 @@ msgstr "a megadott kulcskarik�r�l vegye a kulcsokat"
 msgid "make timestamp conflicts only a warning"
 msgstr "id�b�lyeg-konfliktus eset�n csak figyelmeztessen"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr "|�L|�llapotinform�ci�k �r�sa �L �llom�nyle�r�ra"
 
@@ -6473,62 +6473,62 @@ msgstr ""
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6536,113 +6536,113 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 #, fuzzy
 msgid "key already exists\n"
 msgstr "\"%s\" m�r t�m�r�tett.\n"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 #, fuzzy
 msgid "generating new key\n"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
@@ -6651,7 +6651,7 @@ msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 #, fuzzy
 msgid "read options from file"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
@@ -6733,131 +6733,139 @@ msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "rossz igazol�s"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Kulcs tal�lhat�: "
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "visszavon�si igazol�s k�sz�t�se"
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Ez a kulcs lej�rt!"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "al��r�s ellen�rz�se"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6866,7 +6874,7 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "A DSA 160 bites hash (kivonatol�) algoritmust ig�nyel.\n"
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6943,42 +6951,47 @@ msgstr ""
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Ez nem �rv�nyes e-mail c�m.\n"
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
@@ -7031,185 +7044,185 @@ msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[f�jl]|al��r�s k�sz�t�se"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "titkos kulcsok list�z�sa"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "rossz igazol�s"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "rossz igazol�s"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "rossz igazol�s"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 msgid "|NAME|use NAME as default recipient"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 msgid "use the default key as default recipient"
 msgstr "alap�rt. kulcs haszn. alap�rt. c�mzettk�nt"
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr "ne haszn�lja a termin�lt egy�ltal�n"
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 msgid "force v3 signatures"
 msgstr "3-as verzi�j� al��r�sok er�ltet�se"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr "mindig haszn�ljon MDC-t titkos�t�skor"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr "k�tegelt m�d: soha nem k�rdez"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr "igen v�lasz felt�telez�se a legt�bb k�rd�sre"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr "nem v�lasz felt�telez�se a legt�bb k�rd�sre"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "add this keyring to the list of keyrings"
 msgstr "kulcskarika hozz�ad�sa a kulcskarikalist�hoz"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "add this secret keyring to the list"
 msgstr "titkoskulcs-karika hozz�ad�sa a list�hoz"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett titkos kulcsk�nt"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|G�PN�V|kulcsszerver be�ll�t�sa kulcsok keres�s�hez"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|N�V|termin�l karakterk�dol�s�nak megad�sa"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr "|f�jl|b�v�t� modul bet�lt�se"
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|N�V|N�V rejtjelez� algoritmus haszn�lata"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|N�V|N�V kivonatol� algoritmus haszn�lata"
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 msgid "|N|use compress algorithm N"
 msgstr "|N|N. sorsz�m� t�m�r�t� algoritmus haszn�lata"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 #, 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:523
+#: sm/gpgsm.c:521
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7220,36 +7233,36 @@ 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:617
+#: sm/gpgsm.c:615
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, 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:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7370,7 +7383,7 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
diff --git a/po/id.po b/po/id.po
index 7889540bb..e2499561c 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <[email protected]>\n"
 "Language-Team: Indonesian <[email protected]>\n"
@@ -86,8 +86,8 @@ msgstr "tidak dapat membuat %s: %s\n"
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
@@ -200,13 +200,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "detil"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
@@ -231,7 +231,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 #, fuzzy
 msgid "use a log file for the server"
@@ -289,14 +289,14 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Laporkan bug ke <[email protected]>.\n"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ""
@@ -322,30 +322,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
 #: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
@@ -578,58 +578,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 #, fuzzy
 msgid "Yes"
 msgstr "y|ya"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -1467,7 +1467,7 @@ msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
 
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1483,27 +1483,27 @@ msgstr "|[file]|buat signature"
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "tampilkan kunci"
 
@@ -1516,15 +1516,15 @@ msgstr "tampilkan kunci dan signature"
 msgid "list and check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
@@ -1556,11 +1556,11 @@ msgstr "buat sertifikat revokasi"
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
@@ -1596,7 +1596,7 @@ msgstr "perbarui database trust"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1607,31 +1607,31 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
@@ -1647,7 +1647,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1655,7 +1655,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1693,7 +1693,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/gpg.c:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1721,7 +1721,7 @@ msgstr "Kompresi: "
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
@@ -1980,7 +1980,7 @@ msgstr "%s:%d: opsi ekspor tidak valid\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
@@ -2026,11 +2026,11 @@ msgstr ""
 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:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
@@ -2268,7 +2268,7 @@ msgstr "mengambil kunci ini dari keyring"
 msgid "make timestamp conflicts only a warning"
 msgstr "buat timestamp konflik hanya sebagai peringatan"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
@@ -6476,62 +6476,62 @@ msgstr ""
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6539,113 +6539,113 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "gagal membaca keyblock: %s\n"
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 #, fuzzy
 msgid "generating new key\n"
 msgstr "buat sepasang kunci baru"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
@@ -6654,7 +6654,7 @@ msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 #, fuzzy
 msgid "read options from file"
 msgstr "membaca pilihan dari `%s'\n"
@@ -6736,131 +6736,139 @@ msgstr "protokol gpg-agent versi %d tidak didukung\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "protokol gpg-agent versi %d tidak didukung\n"
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "CATATAN: kunci telah dibatalkan"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "sertifikat yang buruk"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Kunci tersedia di:"
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "buat sertifikat revokasi"
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Kunci ini telah berakhir!"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "tampilkan fingerprint"
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifikasi signature"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6869,7 +6877,7 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA butuh penggunaan algoritma hash 160 bit\n"
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6945,42 +6953,47 @@ msgstr ""
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "kesalahan menulis keyring `%s': %s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
@@ -7033,185 +7046,185 @@ msgstr "kesalahan penciptaan passphrase: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "menulis ke `%s'\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "tampilkan kunci rahasia"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "ubah passphrase"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "ciptakan output ascii"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 msgid "use the default key as default recipient"
 msgstr "gunakan kunci baku sebagai penerima baku"
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr "jangan menggunakan terminal"
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 msgid "force v3 signatures"
 msgstr "paksa signature v3"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr "selalu gunakan MDC untuk enkripsi"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "add this keyring to the list of keyrings"
 msgstr "tambah keyring ini ke daftar keyring"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "add this secret keyring to the list"
 msgstr "tambah keyring rahasia ini ke daftar"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMA|set charset terminal ke NAMA"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 msgid "|N|use compress algorithm N"
 msgstr "|N|gunakan algoritma kompresi N"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:521
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7222,36 +7235,36 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:615
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7372,7 +7385,7 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
diff --git a/po/it.po b/po/it.po
index 50ce3c5e6..4d1ddaf88 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 2004-06-16 17:01+0200\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -84,8 +84,8 @@ msgstr "impossibile creare `%s': %s\n"
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
@@ -198,13 +198,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "prolisso"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
@@ -229,7 +229,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 #, fuzzy
 msgid "use a log file for the server"
@@ -287,14 +287,14 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ""
@@ -320,30 +320,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, 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:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
@@ -576,58 +576,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 #, fuzzy
 msgid "Yes"
 msgstr "si|s�"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "impossibile aprire il file: %s\n"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "errore leggendo `%s': %s\n"
@@ -1476,7 +1476,7 @@ msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
 
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1492,27 +1492,27 @@ msgstr "|[file]|fai una firma"
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "elenca le chiavi"
 
@@ -1525,15 +1525,15 @@ msgstr "elenca le chiavi e le firme"
 msgid "list and check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
@@ -1565,11 +1565,11 @@ msgstr "genera un certificato di revoca"
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
@@ -1605,7 +1605,7 @@ msgstr "aggiorna il database della fiducia"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1616,31 +1616,31 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
@@ -1656,7 +1656,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1664,7 +1664,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1702,7 +1702,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/gpg.c:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1730,7 +1730,7 @@ msgstr "Compressione: "
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
@@ -1992,7 +1992,7 @@ msgstr "%s:%d: opzioni di esportazione non valide\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
@@ -2034,11 +2034,11 @@ 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:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
@@ -2274,7 +2274,7 @@ msgstr "prende le chiavi da questo portachiavi"
 msgid "make timestamp conflicts only a warning"
 msgstr "segnala i conflitti di data solo con un avvertimento"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato sul FD"
 
@@ -6524,62 +6524,62 @@ msgstr ""
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "rebuild della cache del portachiavi fallito: %s\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6587,113 +6587,113 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "errore leggendo il keyblock: %s\n"
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: errore durante la lettura del record libero: %s\n"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' � gi� compresso\n"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genera una nuova coppia di chiavi"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
@@ -6702,7 +6702,7 @@ msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 #, fuzzy
 msgid "read options from file"
 msgstr "lettura delle opzioni da `%s'\n"
@@ -6784,131 +6784,139 @@ msgstr "la versione %d del protocollo di gpg-agent non � gestita\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "la versione %d del protocollo di gpg-agent non � gestita\n"
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: la chiave � stata revocata"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "certificato danneggiato"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Chiave disponibile presso: "
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "genera un certificato di revoca"
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Questa chiave � scaduta!"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "mostra le impronte digitali"
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifica una firma"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6917,7 +6925,7 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA richiede l'uso di un algoritmo di hashing con almeno 160 bit\n"
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6993,42 +7001,47 @@ msgstr ""
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "L'indirizzo di email non � valido\n"
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "errore creando il portachiavi `%s': %s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "errore creando il portachiavi `%s': %s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
@@ -7081,185 +7094,185 @@ msgstr "errore nella creazione della passhprase: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "scrittura in `%s'\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "elenca le chiavi segrete"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "certificato danneggiato"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "certificato danneggiato"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "certificato danneggiato"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "cambia la passphrase"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crea un output ascii con armatura"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 msgid "use the default key as default recipient"
 msgstr "usa la chiave predefinita come destinatario predefinito"
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr "usa sempre un MDC per cifrare"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr "risponde \"s�\" a quasi tutte le domande"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr "risponde \"no\" a quasi tutte le domande"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "add this keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME come chiave segreta predefinita"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOME|imposta NOME come set di caratteri del terminale"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di cifratura NOME"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di message digest NOME"
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:521
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7270,36 +7283,36 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:615
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "impossibile connettersi a `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "impossibile chiudere `%s': %s\n"
 
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7420,7 +7433,7 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
diff --git a/po/ja.po b/po/ja.po
index ea59a1532..ac6cd6ba0 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 2004-11-23 11:14+0900\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -87,8 +87,8 @@ msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
@@ -201,13 +201,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "��Ĺ"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "����Ť�"
 
@@ -232,7 +232,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 #, fuzzy
 msgid "use a log file for the server"
@@ -290,14 +290,14 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ""
@@ -323,30 +323,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
 #: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
@@ -579,58 +579,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 #, fuzzy
 msgid "Yes"
 msgstr "yes"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "��̾���줿�ǡ�����%s�פ������ޤ���\n"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "���Ը�����μ������顼: %s\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
@@ -1425,7 +1425,7 @@ msgstr "����%s��縰%s�����Ѥ��ޤ�\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "��%s: �������Τʤ���̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1441,27 +1441,27 @@ msgstr "|[�ե�����]|��̾�����"
 msgid "|[file]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (����)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "�����"
 
@@ -1473,15 +1473,15 @@ msgstr "���Ƚ�̾�ΰ���"
 msgid "list and check key signatures"
 msgstr "����̾�θ����Ȱ���"
 
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "��������������"
 
@@ -1513,11 +1513,11 @@ msgstr "���������������"
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
@@ -1553,7 +1553,7 @@ msgstr "���ѥǡ����١����򹹿�"
 msgid "|algo [files]|print message digests"
 msgstr "|���르�ꥺ�� [�ե�����]|��å����������ɽ��"
 
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1564,35 +1564,35 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "��̾������ˤ��Υ桼����id\n"
 "�����"
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|���̥�٥��N������\n"
 "(0���󰵽�)"
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "���ϥե�����Ȥ��ƻ���"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
@@ -1608,7 +1608,7 @@ msgstr "��̩��OpenPGP�ο�������"
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x�ߴ��Υ�å�����������"
 
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1617,7 +1617,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1655,7 +1655,7 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: g10/gpg.c:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1683,7 +1683,7 @@ msgstr "����: "
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "��Ω���륳�ޥ��\n"
 
@@ -1938,7 +1938,7 @@ msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
@@ -1978,11 +1978,11 @@ msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
 
-#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
@@ -2210,7 +2210,7 @@ msgstr "���θ����ؤ��������ޤ�"
 msgid "make timestamp conflicts only a warning"
 msgstr "������̷���ٹ�����ˤ��ޤ�"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
@@ -6287,62 +6287,62 @@ msgstr ""
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "���������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr "�����˸������ǡ������ޤޤ�Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr "������RSA��ˡ(modulus)���ޤޤ�Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr "������RSA�����ؿ����ޤޤ�Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN������Хå������顼���ᤷ�ޤ���: %s\n"
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d��PIN��û�����ޤ�����û��%d\n"
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d�θ��ڤ˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr "�������ޥ�ɤؤΥ���������������ꤵ��Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr "�����ɤ����CHV���֤θ����ǥ��顼\n"
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr "�����ɤ��ʵפ˥��å�����ޤ�!\n"
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "�����ɤαʵץ��å�����%d��Admin PIN�����Ƥ��ޤ�\n"
@@ -6350,110 +6350,110 @@ msgstr "�����ɤαʵץ��å�����%d��Admin PIN�����Ƥ��ޤ�\n"
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr "|A|Admin PIN"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 #, fuzzy
 msgid "|AN|New Admin PIN"
 msgstr "|A|������Admin PIN"
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 #, fuzzy
 msgid "|N|New PIN"
 msgstr "������PIN"
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "������PIN�μ������顼: %s\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 msgid "error reading application data\n"
 msgstr "���ץꥱ������󡦥ǡ������ɽФ����顼\n"
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 msgid "error reading fingerprint DO\n"
 msgstr "����ǡ��������֥������Ȥ��ɽФ����顼\n"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 msgid "key already exists\n"
 msgstr "���Ϥ⤦����ޤ�\n"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr "��¸�θ��ϸ򴹤���ޤ�\n"
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 msgid "generating new key\n"
 msgstr "��������������\n"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, fuzzy, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "�����ؿ����礭�����ޤ� (32�ӥåȤ����)\n"
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr "�������δ֡����Ԥ��������� ...\n"
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 msgid "generating key failed\n"
 msgstr "���������˼��Ԥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "������������λ���ޤ��� (%d��)\n"
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP�����ɤ�̵���ʹ�¤ (�ǡ��������֥������� 0x93)\n"
 
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "����ޤǤ˺������줿��̾: %lu\n"
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, fuzzy, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "PIN [��̾��: %lu]"
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s�˥��������Ǥ��ޤ��� - ̵����OpenPGP������?\n"
@@ -6462,7 +6462,7 @@ msgstr "%s�˥��������Ǥ��ޤ��� - ̵����OpenPGP������?\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 #, fuzzy
 msgid "read options from file"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
@@ -6541,131 +6541,139 @@ msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "��̩���ν�Ф��϶ػߤǤ�\n"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "����: ���ϼ����ѤߤǤ�"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "�ʲ��˸�������ޤ�: "
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "���������������"
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 #, fuzzy
 msgid "certificate has expired"
 msgstr "���θ�����λ�Ǥ�!"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "CA���: "
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "��̾�򸡾�"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6674,7 +6682,7 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA�Ǥ�160�ӥåȤΥϥå��塦���르�ꥺ��λ��Ѥ�ɬ�פǤ�\n"
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6750,42 +6758,47 @@ msgstr ""
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "ͭ�����Żҥ᡼�롦���ɥ쥹�ǤϤ���ޤ���\n"
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "���ء�%s�פκ������顼: %s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "���ء�%s�פκ������顼: %s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "���������˼��Ԥ��ޤ���: %s\n"
@@ -6838,194 +6851,194 @@ msgstr "�ѥ��ե졼���κ������顼: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "%s: �ǥ��쥯�ȥ꡼���쥳���ɤν���ߥ��顼: %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[�ե�����]|��̾�����"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "��̩���ΰ���"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "�������ؤ��鸰������"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "register a smartcard"
 msgstr "���ޡ��ȥ����ɤظ����ɲ�"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "ASCII���������������"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "�����å�: �������ϴ���μ���ͤȤ��Ƥ⤦����ѤߤǤ�\n"
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "��̾�μ���"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "���θ����ؤ��������ޤ�"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "̤�ΤΰŹ楢�르�ꥺ��Ǥ�"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "̤�Τΰ��̥��르�ꥺ��Ǥ�"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:521
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7036,36 +7049,36 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:615
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "��%s�פ˥��������Ǥ��ޤ���: %s\n"
 
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7186,7 +7199,7 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
diff --git a/po/nb.po b/po/nb.po
index 47c073882..674f0a539 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.3\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 2006-06-13 20:31+0200\n"
 "Last-Translator: Trond Endrest�l <[email protected]>\n"
 "Language-Team: Norwegian Bokm�l <[email protected]>\n"
@@ -87,8 +87,8 @@ msgstr "kan ikke opprette �%s�: %s\n"
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �pne �%s�: %s\n"
@@ -201,13 +201,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "fyldig output"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "v�re noenlunde stille"
 
@@ -232,7 +232,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 #, fuzzy
 msgid "use a log file for the server"
@@ -290,14 +290,14 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Vennligst rapporter feil til <[email protected]>.\n"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ""
@@ -323,30 +323,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MERK: ingen standard valgfil �%s�\n"
 
 #: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "valgfil �%s�: %s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leser valg fra �%s�\n"
@@ -575,58 +575,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 #, fuzzy
 msgid "Yes"
 msgstr "ja"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "kan ikke �pne n�kkelknippet"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "feil ved lesing av �%s�: %s\n"
@@ -1422,7 +1422,7 @@ msgstr "bruker undern�kkel %s i stedet for prim�rn�kkel %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "n�kkel %s: hemmelig n�kkel uten offentlig n�kkel - hoppet over\n"
 
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1438,27 +1438,27 @@ msgstr "|[fil]|lage en signatur"
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|lage en klartekstsignatur"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "lage en adskilt signatur"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "kryptere data"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "kryptering med bare symmetrisk cipher"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "dekryptere data (standard)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "bekrefte en signatur"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "liste n�kler"
 
@@ -1470,15 +1470,15 @@ msgstr "liste n�kler og signaturer"
 msgid "list and check key signatures"
 msgstr "vise og sjekke n�kkelsignaturer"
 
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "liste n�kler og fingeravtrykk"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "liste hemmelige n�kler"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "generere et nytt n�kkelpar"
 
@@ -1510,11 +1510,11 @@ msgstr "generere et opphevingssertifikat"
 msgid "export keys"
 msgstr "eksportere n�kler"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "eksportere n�kler til en n�kkelserver"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "importere n�kler fra en n�kkelserver"
 
@@ -1550,7 +1550,7 @@ msgstr "oppdatere tillitsdatabasen"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skrive meldingsdigester"
 
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1561,31 +1561,31 @@ msgstr ""
 "Valg:\n"
 " "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr "lage ASCII-beskyttet output"
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAVN|kryptere for NAVN"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr "bruke denne brukeriden for signering eller dekryptering"
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sette kompresjonsniv� til N (0 sl�r av kompresjon)"
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr "bruk kanonisk tekstmodus"
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "bruk som outputfil"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "ikke gj�r noen endringer"
 
@@ -1601,7 +1601,7 @@ msgstr "bruk streng OpenPGP-oppf�rsel"
 msgid "generate PGP 2.x compatible messages"
 msgstr "generere PGP 2.x-kompatible meldinger"
 
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1609,7 +1609,7 @@ msgstr ""
 "@\n"
 "(Se mansiden for en komplett liste over alle kommandoene og valgene)\n"
 
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1647,7 +1647,7 @@ msgstr ""
 "signere, sjekke, kryptere eller dekryptere\n"
 "standard operasjon avhenger av inputdata\n"
 
-#: g10/gpg.c:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1675,7 +1675,7 @@ msgstr "Kompresjon: "
 msgid "usage: gpg [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "motstridende kommandoer\n"
 
@@ -1934,7 +1934,7 @@ msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
 
@@ -1974,11 +1974,11 @@ msgstr "du m� bruke filer (og ikke en pipe) n�r --pgp2 er p�sl�tt\n"
 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:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt krypteringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr "valg digestalgoritme er ugyldig\n"
 
@@ -2207,7 +2207,7 @@ msgstr "hent n�klene fra dette n�kkelknippet"
 msgid "make timestamp conflicts only a warning"
 msgstr "la konflikter mellom tidsstempler bare v�re en advarsel"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skrive statusinfo til denne FD"
 
@@ -6166,62 +6166,62 @@ msgstr ""
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "klarte ikke � lagre opprettelsesdatoen: %s\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr "respons inneholder ikke data om offentlig n�kkel\n"
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr "respons inneholder ikke RSA-modulus\n"
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr "respons inneholder ikke den offentlige RSA-eksponenten\n"
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-callback returnerte en feil: %s\n"
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN for CHV%d er for kort; minum lengde er %d\n"
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "bekreftelse av CHV%d mislyktes: %s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr "feil ved henting av CHV-status fra kort\n"
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr "kort er permanent l�st!\n"
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d Admin PIN-fors�k f�r kortet blir l�st permanent\n"
@@ -6229,108 +6229,108 @@ msgstr "%d Admin PIN-fors�k f�r kortet blir l�st permanent\n"
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr "|A|Admin PIN"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny Admin PIN"
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN"
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "feil ved henting av ny PIN: %s\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 msgid "error reading application data\n"
 msgstr "feil ved lesing av applikasjonsdata\n"
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 msgid "error reading fingerprint DO\n"
 msgstr "feil ved lesing av fingeravtrykk DO\n"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 msgid "key already exists\n"
 msgstr "n�kkel finnes allerede\n"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr "eksisterende n�kkel vil bli erstattet\n"
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 msgid "generating new key\n"
 msgstr "generere en ny n�kkel\n"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr "tidsstempel for opprettelse mangler\n"
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA-modulus mangler eller har ikke en st�rrelse p� %d bits\n"
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "offentlig RSA-eksponent mangler eller er st�rre enn %d bits\n"
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA-primtall %s mangler eller har ikke en st�rrelse p� %d bits\n"
 
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "klarte ikke � lagre n�kkelen: %s\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr "vennligst vent mens n�kkel blir generert ...\n"
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 msgid "generating key failed\n"
 msgstr "n�kkelgenerering mislyktes\n"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "n�kkelgenerering fullf�rt (%d sekunder)\n"
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ugyldig struktur i OpenPGP-kort (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kortet st�tter ikke digestalgoritme %s\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer opprettet s� langt: %lu\n"
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "bekrefting av Admin PIN er forel�pig nektet gjennom denne kommandoen\n"
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\n"
@@ -6339,7 +6339,7 @@ msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 #, fuzzy
 msgid "read options from file"
 msgstr "leser valg fra �%s�\n"
@@ -6417,130 +6417,138 @@ msgstr ""
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr ""
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "Kan ikke �pne �%s�: %s\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "eksportering av hemmelige n�kler er ikke tillatt\n"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "klarte ikke � lagre n�kkelen: %s\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 msgid "certificate has been revoked"
 msgstr ""
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "ugyldig sertifikat"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "N�kkel tilgjengelig ved: "
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "sleting av n�kkelblokk mislyktes: %s\n"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "generere et opphevingssertifikat"
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Denne n�kkelen er utg�tt!"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "CA-fingeravtrykk: "
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "bekrefte en signatur"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6549,7 +6557,7 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA krever bruk av en 160-bit hashalgoritme\n"
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6625,42 +6633,47 @@ msgstr ""
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "ugyldig hashalgoritme �%s�\n"
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "N�kkelgenerering mislyktes: %s\n"
@@ -6713,193 +6726,193 @@ msgstr "feil ved opprettelse av passfrase: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[fil]|lage en signatur"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[fil]|lage en klartekstsignatur"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "liste hemmelige n�kler"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "ugyldig sertifikat"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "fjerne n�kler fra det offentlige n�kkelknippet"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "ugyldig sertifikat"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "ugyldig sertifikat"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "endre passfrasen"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "lage ASCII-beskyttet output"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "hoppet over: offentlig n�kkel allerede satt som standard mottaker\n"
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "sjekke signaturer"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "hent n�klene fra dette n�kkelknippet"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "Trenger den hemmelige n�kkelen for � gj�re dette.\n"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAVN|kryptere for NAVN"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "ukjent kryptoalgoritme"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s signatur, digestalgoritme %s\n"
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "ukjent kompresjonsalgoritme"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:521
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -6910,36 +6923,36 @@ msgstr ""
 "signere, sjekke, kryptere eller dekryptere\n"
 "standard operasjon avhenger av inputdata\n"
 
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:615
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan ikke aksere �%s�: %s\n"
 
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7060,7 +7073,7 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 7a6d72cc7..797270622 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 2004-06-23 15:54+0200\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -94,8 +94,8 @@ msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
@@ -208,13 +208,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "z dodatkowymi informacjami"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�ww"
 
@@ -239,7 +239,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 #, fuzzy
 msgid "use a log file for the server"
@@ -298,14 +298,14 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ""
@@ -331,30 +331,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
 #: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
@@ -587,58 +587,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 #, fuzzy
 msgid "Yes"
 msgstr "tak"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nie mo�na otworzy� pliku: %s\n"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
@@ -1478,7 +1478,7 @@ msgstr "u�ywany jest podklucz %08lX zamiast klucza g��wnego %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pomini�ty\n"
 
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1494,27 +1494,27 @@ msgstr "|[plik]|z�o�enie podpisu"
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu pod dokumentem"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lne)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "lista kluczy"
 
@@ -1527,15 +1527,15 @@ msgstr "lista kluczy i podpis�w"
 msgid "list and check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "lista kluczy prywatnych"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "generacja nowej pary kluczy"
 
@@ -1567,11 +1567,11 @@ msgstr "tworzenie certyfikatu uniewa�nienia klucza"
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
@@ -1607,7 +1607,7 @@ msgstr "uaktualnienie bazy zaufania"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1618,31 +1618,31 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - bez)"
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
@@ -1658,7 +1658,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1666,7 +1666,7 @@ msgstr ""
 "@\n"
 "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1705,7 +1705,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/gpg.c:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1733,7 +1733,7 @@ msgstr "Kompresji: "
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
@@ -2006,7 +2006,7 @@ msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
@@ -2048,11 +2048,11 @@ msgstr "w trybie --pgp2 trzeba u�ywa� plik�w a nie potok�w.\n"
 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:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
@@ -2287,7 +2287,7 @@ msgstr "pobieranie kluczy z tego zbioru"
 msgid "make timestamp conflicts only a warning"
 msgstr "nie traktowa� konfliktu datownik�w jako b��du"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr "|FD|pisanie opisu stanu do deskryptora FD"
 
@@ -6508,62 +6508,62 @@ msgstr ""
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "nie powiod�a si� odbudowa bufora bazy: %s\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6571,113 +6571,113 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "b��d odczytu bloku kluczy: %s\n"
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: b��d odczytu pustego wpisu: %s\n"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 #, fuzzy
 msgid "key already exists\n"
 msgstr ",,%s'' ju� jest skompresowany\n"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 #, fuzzy
 msgid "generating new key\n"
 msgstr "generacja nowej pary kluczy"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
@@ -6686,7 +6686,7 @@ msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 #, fuzzy
 msgid "read options from file"
 msgstr "odczyt opcji z ,,%s''\n"
@@ -6768,140 +6768,148 @@ msgstr "wersja %d protoko�u agenta nie jest obs�ugiwana\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "wersja %d protoko�u agenta nie jest obs�ugiwana\n"
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "UWAGA: klucz zosta� uniewa�niony"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Poprawny certyfikat"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Klucz dost�pny w: "
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Poprawny certyfikat"
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "b��d przy odczycie certyfikatu: %s\n"
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 #, fuzzy
 msgid "certificate not yet valid"
 msgstr "Poprawne uniewa�nienie certyfikatu"
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 #, fuzzy
 msgid "certificate has expired"
 msgstr "b��d przy odczycie certyfikatu: %s\n"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 #, fuzzy
 msgid "root certificate is not marked trusted"
 msgstr ""
 "Brak certyfikat�w o niezdefiniowanym poziomie zaufania.\n"
 "\n"
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Odcisk klucza:"
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 #, fuzzy
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "Brak certyfikat�w o niezdefiniowanym poziomie zaufania.\n"
 "\n"
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Poprawne uniewa�nienie certyfikatu"
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Poprawne uniewa�nienie certyfikatu"
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "sprawdzenie podpisu"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6911,7 +6919,7 @@ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr ""
 "Algorytm DSA wymaga u�ycia algorytmu skr�tu daj�cego 160-bitowy wynik.\n"
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6987,42 +6995,47 @@ msgstr ""
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
@@ -7075,185 +7088,185 @@ msgstr "b��d podczas tworzenia has�a: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "b��d zapisu zbioru kluczy '%': %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu pod dokumentem"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "lista kluczy prywatnych"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Poprawne uniewa�nienie certyfikatu"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "Poprawny certyfikat"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "Poprawny certyfikat"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "zmiana has�a klucza"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 msgid "use the default key as default recipient"
 msgstr "domy�lny klucz jest domy�lnym adresatem"
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr "bez odwo�a� do terminala"
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 msgid "force v3 signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpis�w"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr "do szyfrowania b�dzie u�ywany MDC"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: �adnych pyta�"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr "automatyczna odpowied� tak na wi�kszo�� pyta�"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr "automatyczna odpowied� nie na wi�kszo�� pyta�"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "add this keyring to the list of keyrings"
 msgstr "dodanie zbioru kluczy do u�ywanych"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "add this secret keyring to the list"
 msgstr "dodanie zbioru kluczy tajnych do u�ywanych"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|ustawienie NAZWA jako domy�lnego klucza prywatnego"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|serwer kluczy w kt�rym b�d� poszukiwane"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAZWA| strona kodowa wy�wietlanego tekstu"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|wymuszenie algorytmu szyfruj�cego NAZWA"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|wymuszenie algorytmu skr�tu  NAZWA"
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 msgid "|N|use compress algorithm N"
 msgstr "|N|wymuszenie algorytmu kompresji N"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpgm [opcje] [pliki] (-h podaje pomoc)"
 
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:521
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7264,36 +7277,36 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:615
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "spos�b u�ycia: gpgm [opcje]"
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nie mo�na zamkn�� ,,%s'': %s\n"
 
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7414,7 +7427,7 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
diff --git a/po/pt.po b/po/pt.po
index 97bb2ee3c..ad7f47af8 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt <[email protected]>\n"
@@ -87,8 +87,8 @@ msgstr "imposs�vel criar `%s': %s\n"
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -201,13 +201,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "detalhado"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
@@ -232,7 +232,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 #, fuzzy
 msgid "use a log file for the server"
@@ -291,14 +291,14 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ""
@@ -324,30 +324,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, 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:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
@@ -580,58 +580,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 #, fuzzy
 msgid "Yes"
 msgstr "sim"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -1469,7 +1469,7 @@ msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1485,27 +1485,27 @@ msgstr "|[ficheiro]|fazer uma assinatura"
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra sim�trica"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "decifrar dados (ac��o por omiss�o)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "listar as chaves"
 
@@ -1518,15 +1518,15 @@ msgstr "listar as chaves e as assinaturas"
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
@@ -1558,11 +1558,11 @@ msgstr "gerar um certificado de revoga��o"
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor de chaves"
 
@@ -1598,7 +1598,7 @@ msgstr "actualizar a base de dados de confian�a"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1609,35 +1609,35 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou decifrar"
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "usar como ficheiro de sa�da"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
@@ -1653,7 +1653,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1661,7 +1661,7 @@ msgstr ""
 "@\n"
 "(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
 
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1699,7 +1699,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1727,7 +1727,7 @@ msgstr "Compress�o: "
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
@@ -1988,7 +1988,7 @@ msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
@@ -2029,11 +2029,11 @@ msgstr ""
 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:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
@@ -2271,7 +2271,7 @@ msgstr "Remover esta chave do porta-chaves?"
 msgid "make timestamp conflicts only a warning"
 msgstr "conflito de \"timestamp\""
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DF|escrever informa��es de estado para o\n"
@@ -6484,62 +6484,62 @@ msgstr ""
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6547,113 +6547,113 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 #, fuzzy
 msgid "key already exists\n"
 msgstr "%s' j� comprimido\n"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
@@ -6662,7 +6662,7 @@ msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 #, fuzzy
 msgid "read options from file"
 msgstr "a ler op��es de `%s'\n"
@@ -6744,131 +6744,139 @@ msgstr "a vers�o %d do protocolo gpg-agent n�o � suportada\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "a vers�o %d do protocolo gpg-agent n�o � suportada\n"
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: a chave foi revogada"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "certificado incorrecto"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Esta chave expirou!"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "mostra impress�o digital"
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verificar uma assinatura"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6877,7 +6885,7 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA necessita de utiliza��o de uma algoritmo de dispers�o de 160 bit\n"
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6955,42 +6963,47 @@ msgstr ""
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "erro ao criar porta-chaves `%s': %s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
@@ -7043,189 +7056,189 @@ msgstr "erro na cria��o da frase secreta: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "a escrever para `%s'\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "listar as chaves secretas"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "remover chaves do porta-chaves p�blico"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muda a frase secreta"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "criar sa�da com armadura ascii"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 msgid "use the default key as default recipient"
 msgstr "usar a chave por omiss�o como destinat�rio por omiss�o"
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para cifrar"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr "modo n�o-interactivo: nunca perguntar"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "adicionar este porta-chaves\n"
 "� lista de porta-chaves"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "add this secret keyring to the list"
 msgstr "adicionar este porta-chaves secreto � lista"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omiss�o"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:521
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7236,36 +7249,36 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:615
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [op��es] "
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "imposs�vel ligar a `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "imposs�vel fechar `%s': %s\n"
 
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7386,7 +7399,7 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 63c080d79..b2a511ac7 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -91,8 +91,8 @@ msgstr "imposs�vel criar %s: %s\n"
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -206,13 +206,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "detalhado"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
@@ -237,7 +237,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 #, fuzzy
 msgid "use a log file for the server"
@@ -295,14 +295,14 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ""
@@ -328,30 +328,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, 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:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
@@ -582,58 +582,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 #, fuzzy
 msgid "Yes"
 msgstr "sim"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "imposs�vel abrir arquivo: %s\n"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -1469,7 +1469,7 @@ msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1485,29 +1485,29 @@ msgstr "|[arquivo]|fazer uma assinatura"
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "listar as chaves"
 
@@ -1520,15 +1520,15 @@ msgstr "listar as chaves e as assinaturas"
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
@@ -1562,11 +1562,11 @@ msgstr "gerar um certificado de revoga��o"
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
@@ -1604,7 +1604,7 @@ msgstr "atualizar o banco de dados de confiabilidade"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1615,35 +1615,35 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "usar como arquivo de sa�da"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
@@ -1659,13 +1659,13 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1703,7 +1703,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1732,7 +1732,7 @@ msgstr "Coment�rio: "
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
@@ -1993,7 +1993,7 @@ msgstr "AVISO: `%s' � um arquivo vazio\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
@@ -2033,11 +2033,11 @@ msgstr ""
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
@@ -2283,7 +2283,7 @@ msgstr "Deletar esta chave do chaveiro? "
 msgid "make timestamp conflicts only a warning"
 msgstr "conflito de \"timestamp\""
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DA|escrever informa��es de estado para o\n"
@@ -6424,62 +6424,62 @@ msgstr ""
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6487,113 +6487,113 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro lendo registro livre: %s\n"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 #, fuzzy
 msgid "key already exists\n"
 msgstr "%lu chaves processadas\n"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
@@ -6602,7 +6602,7 @@ msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 #, fuzzy
 msgid "read options from file"
 msgstr "lendo op��es de `%s'\n"
@@ -6683,140 +6683,148 @@ msgstr "algoritmo de prote��o %d n�o � suportado\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "chave %08lX: a chave foi revogada!\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Certificado correto"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "leitura de registro de assinatura falhou: %s\n"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Certificado correto"
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "erro de leitura do certificado: %s\n"
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 #, fuzzy
 msgid "certificate not yet valid"
 msgstr "Certificado de revoga��o v�lido"
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 #, fuzzy
 msgid "certificate has expired"
 msgstr "erro de leitura do certificado: %s\n"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 #, fuzzy
 msgid "root certificate is not marked trusted"
 msgstr ""
 "Nenhum certificado com confian�a indefinida encontrado.\n"
 "\n"
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Impress�o digital:"
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 #, fuzzy
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "Nenhum certificado com confian�a indefinida encontrado.\n"
 "\n"
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "leitura de registro de assinatura falhou: %s\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Certificado de revoga��o v�lido"
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Certificado de revoga��o v�lido"
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verificar uma assinatura"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6825,7 +6833,7 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr ""
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6903,42 +6911,47 @@ msgid "certificate is not usable for signing\n"
 msgstr ""
 
 # "hash" poderia ser "espalhamento", mas n�o fica claro
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "erro na escrita do chaveiro `%s': %s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
@@ -6991,187 +7004,187 @@ msgstr "erro na cria��o da frase secreta: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "erro na escrita do chaveiro `%': %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "listar as chaves secretas"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Certificado de revoga��o v�lido"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificado correto"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificado correto"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muda a frase secreta"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "criar sa�da com armadura ascii"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 msgid "use the default key as default recipient"
 msgstr "usar a chave padr�o como destinat�rio padr�o"
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr "modo n�o-interativo: nunca perguntar"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "add this keyring to the list of keyrings"
 msgstr "adicionar este chaveiro � lista de chaveiros"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "add this secret keyring to the list"
 msgstr "adicionar este chaveiro secreto � lista"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta padr�o"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpgm [op��es] [arquivos] (-h para ajuda)"
 
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:521
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7182,36 +7195,36 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:615
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Uso: gpgm [op��es] "
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7332,7 +7345,7 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "leitura de registro de assinatura falhou: %s\n"
diff --git a/po/ro.po b/po/ro.po
index 8d8efbb68..00a1c8807 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 2005-05-31 22:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
 "Language-Team: Romanian <[email protected]>\n"
@@ -89,8 +89,8 @@ msgstr "nu pot crea `%s': %s\n"
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nu pot deschide `%s': %s\n"
@@ -204,13 +204,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "locvace"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "fii oarecum mai t�cut"
 
@@ -235,7 +235,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 #, fuzzy
 msgid "use a log file for the server"
@@ -293,14 +293,14 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Raporta�i bug-uri la <[email protected]>.\n"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ""
@@ -326,30 +326,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, 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:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
@@ -585,58 +585,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 #, fuzzy
 msgid "Yes"
 msgstr "da"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nu pot deschide fi�ierul: %s\n"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "eroare la citire `%s': %s\n"
@@ -1442,7 +1442,7 @@ msgstr "folosim subcheia %s �n loc de cheia primar� %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "cheia %s: cheie secret� f�r� cheie public� - s�rit�\n"
 
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1458,27 +1458,27 @@ msgstr "|[fi�ier]|creaz� o semn�tur�"
 msgid "|[file]|make a clear text signature"
 msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "creaz� o semn�tur� deta�at�"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "cifreaz� datele"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "cifreaz� numai cu cifru simetric"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "decripteaz� datele (implicit)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "verific� o semn�tur�"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "enumer� chei"
 
@@ -1490,15 +1490,15 @@ msgstr "enumer� chei �i semn�turi"
 msgid "list and check key signatures"
 msgstr "enumer� �i verific� semn�turile cheii"
 
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "enumer� chei �i amprente"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "enumer� chei secrete"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "genereaz� o nou� perechi de chei"
 
@@ -1530,11 +1530,11 @@ msgstr "genereaz� un certificat de revocare"
 msgid "export keys"
 msgstr "export� chei"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "export� chei pentru un server de chei"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "import� chei de la un server de chei"
 
@@ -1570,7 +1570,7 @@ msgstr "actualizeaz� baza de date de �ncredere"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
 
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1581,31 +1581,31 @@ msgstr ""
 "Op�iuni:\n"
 " "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr "creaz� ie�ire �n armur� ascii"
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr "folose�te acest id-utilizator pentru a semna sau decripta"
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|seteaz� nivel de compresie N (0 deactiveaz�)"
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr "folose�te modul text canonic"
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "folose�te ca fi�ier ie�ire"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "nu face nici o schimbare"
 
@@ -1621,7 +1621,7 @@ msgstr "folose�te comportament strict OpenPGP"
 msgid "generate PGP 2.x compatible messages"
 msgstr "genereaz� mesaje compatibile cu PGP 2.x"
 
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1629,7 +1629,7 @@ msgstr ""
 "@\n"
 "(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
 
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1667,7 +1667,7 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: g10/gpg.c:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1695,7 +1695,7 @@ msgstr "Compresie: "
 msgid "usage: gpg [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "comenzi �n conflict\n"
 
@@ -1969,7 +1969,7 @@ msgstr "%s:%d: op�iuni verificare invalide\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
 
@@ -2014,11 +2014,11 @@ msgstr ""
 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:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
@@ -2248,7 +2248,7 @@ msgstr "ia cheile de pe acest inel de chei"
 msgid "make timestamp conflicts only a warning"
 msgstr "d� numai un avertisment la conflicte de timestamp"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrie informa�ii de stare �n acest FD"
 
@@ -6388,62 +6388,62 @@ msgstr ""
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "am e�uat s� stochez amprenta: %s\n"
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "am e�uat s� stochez data cre�rii: %s\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "citirea cheii publice a e�uat: %s\n"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr "r�spunsul nu con�ine datele cheii publice\n"
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr "r�spunsul nu con�ine modulul RSA\n"
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr "r�spunsul nu con�ine exponentul public RSA\n"
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "apelul PIN a returnat eroare: %s\n"
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minim� este %d\n"
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verificarea CHV%d a e�uat: %s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr "accesul la comenzile de administrare nu este configurat�\n"
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr "eroare la recuperarea st�rii CHV de pe card\n"
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr "cardul este �ncuiat permanent!\n"
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d �ncerc�ri PIN Admin r�mase �nainte de a �ncuia cardul permanent\n"
@@ -6451,109 +6451,109 @@ msgstr "%d �ncerc�ri PIN Admin r�mase �nainte de a �ncuia cardul permanent\n"
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr "|A|PIN Admin"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|AN|New Admin PIN"
 msgstr "|AN|PIN Admin Nou"
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|N|New PIN"
 msgstr "|N|PIN Nou"
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eroare la ob�inere noului PIN: %s\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 msgid "error reading application data\n"
 msgstr "eroare la citirea datelor aplica�iei\n"
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 msgid "error reading fingerprint DO\n"
 msgstr "eroare la citirea amprentei DO\n"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 msgid "key already exists\n"
 msgstr "cheia exist� deja\n"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr "cheia existent� va fi �nlocuit�\n"
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 msgid "generating new key\n"
 msgstr "generez o nou� cheie\n"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr "timestamp-ul de creare lipse�te\n"
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "modulus-ul RSA lipse�te sau nu are %d bi�i\n"
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, fuzzy, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "exponentul public RSA lipse�te sau are mai mult de %d bi�i\n"
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "prime-ul RSA %s lipse�te sau nu are %d bi�i\n"
 
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "am e�uat s� stochez cheia: %s\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr "v� rug�m a�tepta�i c�t� vreme este creat� noua cheie ...\n"
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 msgid "generating key failed\n"
 msgstr "generarea cheii a e�uat\n"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generarea cheii este complet� (%d secunde)\n"
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structur� invalid� a cardului OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "semn�tur� %s, algoritm rezumat %s\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "semn�turi create p�n� acum: %lu\n"
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "verificarea PIN-ului Admin este deocamdat� interzis� prin aceast� comand�\n"
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
@@ -6562,7 +6562,7 @@ msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 #, fuzzy
 msgid "read options from file"
 msgstr "citesc op�iuni din `%s'\n"
@@ -6644,131 +6644,139 @@ msgstr "gpg-agent versiune protocol %d nu este suportat\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent versiune protocol %d nu este suportat\n"
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "Nu pot deschide `%s': %s\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "exportul cheilor secrete nu este permis\n"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "am e�uat s� stochez cheia: %s\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOT�: cheia a fost revocat�"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "certificat incorect"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Cheie disponibil� la: "
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "verificarea semn�turii create a e�uat: %s\n"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "genereaz� un certificat de revocare"
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Aceast� cheie a expirat!"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Amprenta CA: "
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "verificarea semn�turii create a e�uat: %s\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verific� o semn�tur�"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6777,7 +6785,7 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA necesit� folosirea unui algoritm cu hash de 160 bi�i\n"
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6854,42 +6862,47 @@ msgstr ""
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Nu este o adres� de email valid�\n"
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "eroare la crearea inelului de chei `%s': %s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "Generarea cheii a e�uat: %s\n"
@@ -6942,186 +6955,186 @@ msgstr "eroare la crearea frazei-parol�: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "%s: eroare scriere �nregistrare dir: %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[fi�ier]|creaz� o semn�tur�"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "enumer� chei secrete"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "�terge chei de pe inelul de chei public"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "register a smartcard"
 msgstr "adaug� o cheie la un smartcard"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "creaz� ie�ire �n armur� ascii"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NUME|folose�te NUME ca destinatar implicit"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 msgid "use the default key as default recipient"
 msgstr "folose�te cheia implicit� ca destinatar implicit"
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr "nu folosi deloc terminalul"
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 msgid "force v3 signatures"
 msgstr "for�eaz� semn�turi v3"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr "folose�te �ntotdeauna un MDC pentru cifrare"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr "modul batch: nu �ntreba niciodat�"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr "presupune da la cele mai multe �ntreb�ri"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr "presupune nu la cele mai multe �ntreb�ri"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "add this keyring to the list of keyrings"
 msgstr "adaug� acest inel de chei la lista inelelor de chei"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "add this secret keyring to the list"
 msgstr "adaug� acest inel de chei secret la list�"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NUME|folose�te NUME ca cheie secret� implicit�"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|folose�te acest server de chei pentru a c�uta chei"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NUME|seteaz� charset-ul pentru terminal ca NUME"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NUME|folose�te algoritm cifrare NUME"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NUME|folose�te algoritm rezumat mesaj NUME"
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 msgid "|N|use compress algorithm N"
 msgstr "|N|folose�te algoritm compresie N"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:521
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7132,36 +7145,36 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:615
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "nu m� pot conecta la `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nu pot accesa `%s': %s\n"
 
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7282,7 +7295,7 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "verificarea semn�turii create a e�uat: %s\n"
diff --git a/po/ru.po b/po/ru.po
index 03e95ced3..c91a8a5ef 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 1.4.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 2005-06-22 02:53+0200\n"
 "Last-Translator: Maxim Britov <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -86,8 +86,8 @@ msgstr "не могу создать `%s': %s\n"
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "не могу открыть `%s': %s\n"
@@ -200,13 +200,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "подробно"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "уменьшить количество выводимой информации"
 
@@ -231,7 +231,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 #, fuzzy
 msgid "use a log file for the server"
@@ -289,14 +289,14 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "О найденных ошибка сообщайте <[email protected]>.\n"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ""
@@ -322,30 +322,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
 
 #: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл конфигурации `%s': %s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "параметры конфигурации взяты из файла `%s'\n"
@@ -578,58 +578,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 #, fuzzy
 msgid "Yes"
 msgstr "да"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "ошибка при создании ключевой фразы (пароля): %s\n"
 
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "не могу открыть подписанные данные `%s'\n"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "ошибка чтения `%s': %s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "ошибка при считывании информации ключа: %s\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "ошибка чтения `%s': %s\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "ошибка чтения `%s': %s\n"
@@ -1428,7 +1428,7 @@ msgstr "использую подклключ %s вместо главного �
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "ключ %s: секретный ключ без открытого ключа - пропущен\n"
 
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1444,27 +1444,27 @@ msgstr "|[file]|создать подпись к файлу"
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|создать прозрачную подпись к файлу"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "создать отделенную подпись"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "зашифровать данные"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "зашифровать только симметричным шифром"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "расшифровать данные (по умолчанию)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "проверить подпись"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "вывести список ключей"
 
@@ -1476,15 +1476,15 @@ msgstr "вывести список ключей и подписей"
 msgid "list and check key signatures"
 msgstr "вывести и проверить подписи ключей"
 
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "вывести список ключей и их отпечатков"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "вывести список секретных ключей"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "создать новую пару ключей"
 
@@ -1516,11 +1516,11 @@ msgstr "создать сертификат отзыва"
 msgid "export keys"
 msgstr "экспортировать ключи"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "экспортировать ключи на сервер ключей"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "импортировать ключи с сервера ключей"
 
@@ -1556,7 +1556,7 @@ msgstr "обновить таблицу доверий"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|вывести хэши файлов"
 
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1567,31 +1567,31 @@ msgstr ""
 "Параметры:\n"
 " "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr "вывод в ASCII формате"
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|зашифровать для получателя NAME"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr "использовать данный User ID для подписывания и расшифрования"
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|установить уровень сжатия N (по умолчанию - 0)"
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr "использовать канонический текстовый режим"
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "вывод в указанный файл"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "не делать никаких изменений"
 
@@ -1607,7 +1607,7 @@ msgstr "строго следовать стандарту OpenPGP"
 msgid "generate PGP 2.x compatible messages"
 msgstr "создает сообщение совместимым с PGP 2.x"
 
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1615,7 +1615,7 @@ msgstr ""
 "@\n"
 "(См. документацию для более полного ознакомления с командами и параметрами)\n"
 
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1653,7 +1653,7 @@ msgstr ""
 "подписать и проверить, зашифровать или расшифровать\n"
 "операция по умолчанию зависит от входных данных\n"
 
-#: g10/gpg.c:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1681,7 +1681,7 @@ msgstr "Алгоритмы сжатия: "
 msgid "usage: gpg [options] "
 msgstr "использование: gpg [опции] "
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "несовместимые команды\n"
 
@@ -1951,7 +1951,7 @@ msgstr "%s:%d: недопустимые параметры проверки \n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти!\n"
 
@@ -1992,11 +1992,11 @@ msgstr "Вы должны использовать файлы (а не кана�
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифрования сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
@@ -2227,7 +2227,7 @@ msgstr "используются ключи из этой таблицы клю�
 msgid "make timestamp conflicts only a warning"
 msgstr "при несоответствии отметки времени - только предупреждением"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr "|FD|выводить инфромацию в файл с дескриптором FD"
 
@@ -6338,62 +6338,62 @@ msgstr ""
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "сбой сохранения отпечатка: %s\n"
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "сбой сохранения даты создания: %s\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "сбой при чтении ключа: %s\n"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr "ответ не содержит данных открытого ключа\n"
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr "в ответе отсутствует модуль RSA\n"
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr "в ответе отсутствует открытая экспонента RSA\n"
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN для CHV%d слишком короток, минимальная длина %d\n"
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "при проверке CHV%d сбой: %s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr "доступ к командам управления не настроен\n"
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr "ошибка получения статуса CHV с карты\n"
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr "карта заблокирована!\n"
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6402,109 +6402,109 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr "|A|Административный PID"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Новый административный PIN"
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|N|New PIN"
 msgstr "|N|Новый PIN"
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "ошибка при получении нового PIN: %s\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 msgid "error reading application data\n"
 msgstr "ошибка чтения данных приложения\n"
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 msgid "error reading fingerprint DO\n"
 msgstr "ошибка чтения отпечатка DO\n"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 msgid "key already exists\n"
 msgstr "ключ уже существует\n"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr "существующий ключ будет заменен\n"
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 msgid "generating new key\n"
 msgstr "генерация нового ключа\n"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr "пропущен штамп создания создания\n"
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "Модули RSA пропущены или не имеют размер %d бит\n"
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "отсутствует открытая экспонента RSA или превышает %d бит\n"
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "Простое число RSA %s пропущено или не имеет размер %d бит\n"
 
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "сбой сохранения ключа: %s\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr "пожалуйста, подождите, пока будет генерироваться ключ ...\n"
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 msgid "generating key failed\n"
 msgstr "сбой при генерации ключа\n"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "ключ сгенерирован (%d секунд)\n"
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "недопутимая структура OpenPGP карты (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s подпись, хэш-функция %s\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "подписей создано: %lu\n"
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Введите PIN%%0A[подписей: %lu]"
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "проверка административного PIN в данный момент запрещен этой командой\n"
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "нет доступа %s - неработоспособная карта OpenPGP?\n"
@@ -6513,7 +6513,7 @@ msgstr "нет доступа %s - неработоспособная карта
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 #, fuzzy
 msgid "read options from file"
 msgstr "параметры конфигурации взяты из файла `%s'\n"
@@ -6592,131 +6592,139 @@ msgstr "протокол gpg-agent версии %d не поддерживает
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "протокол gpg-agent версии %d не поддерживается\n"
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "Не могу открыть `%s': %s\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "экспорт секретных ключей не разрешен\n"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "сбой сохранения ключа: %s\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "ЗАМЕТЬТЕ: ключ был отозван"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "неправильный сертификат"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Ключ доступен на:"
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "сбой проверки созданной подписи: %s\n"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "создать сертификат отзыва"
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Данный ключ просрочен!"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "отпечаток CA: "
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "сбой проверки созданной подписи: %s\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "проверить подпись"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6725,7 +6733,7 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA требует использования 160 битной хэш-функции\n"
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6801,42 +6809,47 @@ msgstr ""
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Неправильный e-mail адрес\n"
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "ошибка создания таблицы ключей `%s': %s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "ошибка создания таблицы ключей `%s': %s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "Сбой при создании ключа: %s\n"
@@ -6889,194 +6902,194 @@ msgstr "ошибка при создании ключевой фразы (пар
 msgid "error writing to temporary file: %s\n"
 msgstr "%s: ошибка внесения записи каталога: %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[file]|создать подпись к файлу"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[file]|создать прозрачную подпись к файлу"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "вывести список секретных ключей"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "неправильный сертификат"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "удалить ключи из таблицы открытых ключей"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "неправильный сертификат"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "неправильный сертификат"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "register a smartcard"
 msgstr "добавить ключ на карту"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "сменить пароль"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "вывод в ASCII формате"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "пропущено: открытый ключ уже установлен для получателя по умолчанию\n"
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "проверка подписей"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "используются ключи из этой таблицы ключей"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "Для данного действия нужен секретный ключ.\n"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|зашифровать для получателя NAME"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "неизвестный алгоритм шифрования"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s подпись, хэш-функция %s\n"
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "неизвестный алгоритм сжатия"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
 
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:521
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7087,36 +7100,36 @@ msgstr ""
 "подписать и проверить, зашифровать или расшифровать\n"
 "операция по умолчанию зависит от входных данных\n"
 
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:615
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "использование: gpg [опции] "
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "не могу подключиться к `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "нет доступа к `%s': %s\n"
 
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7237,7 +7250,7 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "сбой проверки созданной подписи: %s\n"
diff --git a/po/sk.po b/po/sk.po
index 2279edbd7..d43b23dea 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <[email protected]>\n"
 "Language-Team: Slovak <[email protected]>\n"
@@ -83,8 +83,8 @@ msgstr "nem��em vytvori� `%s': %s\n"
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
@@ -197,13 +197,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "s dodato�n�mi inform�ciami"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "by� o trochu tich��"
 
@@ -228,7 +228,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 #, fuzzy
 msgid "use a log file for the server"
@@ -286,7 +286,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 #, fuzzy
 msgid "Please report bugs to <"
@@ -295,7 +295,7 @@ msgstr ""
 "Pripomienky k prekladu <[email protected]>.\n"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ""
@@ -321,30 +321,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, 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:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
@@ -577,58 +577,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 #, fuzzy
 msgid "Yes"
 msgstr "ano"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nemo�no otvori� s�bor: %s\n"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
@@ -1468,7 +1468,7 @@ msgstr "pou��vam sekund�rny k��� %08lX namiesto prim�rneho k���a %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a - presko�en�\n"
 
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1484,27 +1484,27 @@ msgstr "|[s�bor]|vytvori� podpis"
 msgid "|[file]|make a clear text signature"
 msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "vytvori� podpis oddelen� od dokumentu"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "�ifrova� d�ta"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrovanie len so symetrickou �ifrou"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "de�ifrova� d�ta (implicitne)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "verifikova� podpis"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "vyp�sa� zoznam k���ov"
 
@@ -1517,15 +1517,15 @@ msgstr "vyp�sa� zoznam k���ov a podpisov"
 msgid "list and check key signatures"
 msgstr "skontrolova� podpisy k���ov"
 
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "vyp�sa� zoznam k���ov a fingerprintov"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "vyp�sa� zoznam tajn�ch k���ov"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "vytvori� nov� p�r k���ov"
 
@@ -1557,11 +1557,11 @@ msgstr "vytvori� revoka�n� certifik�t"
 msgid "export keys"
 msgstr "exportova� k���e"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "exportova� k���e na server k���ov"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "importova� k���e zo servera k���ov"
 
@@ -1597,7 +1597,7 @@ msgstr "aktualizova� datab�zu d�very"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [s�bory]|vyp�� hash"
 
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1608,35 +1608,35 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|MENO|�ifrova� pre MENO"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "pou�i� toto id u��vate�a na podp�sanie\n"
 " alebo de�ifrovanie"
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavi� �rove� komprim�cie N (0 - �iadna\n"
 " komprim�cia)"
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr "pou�i� k�nonick� textov� m�d"
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "pou�i� ako v�stupn� s�bor"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "nevykona� �iadne zmeny"
 
@@ -1652,7 +1652,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1661,7 +1661,7 @@ msgstr ""
 "(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
 "mo�nost�)\n"
 
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1701,7 +1701,7 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: g10/gpg.c:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1729,7 +1729,7 @@ msgstr "Kompresia: "
 msgid "usage: gpg [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "konfliktn� pr�kazy\n"
 
@@ -1993,7 +1993,7 @@ msgstr "%s:%d: neplatn� parameter pre export\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
 
@@ -2035,11 +2035,11 @@ msgstr "v m�de --pgp2 mus�te pou�i� s�bor (nie r�ru).\n"
 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:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
@@ -2277,7 +2277,7 @@ msgstr "Zmaza� tento k��� zo s�boru k���ov? "
 msgid "make timestamp conflicts only a warning"
 msgstr "konflikt �asov�ho raz�tka"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zap�sa� inform�cie o stave do tohto FD"
 
@@ -6490,62 +6490,62 @@ msgstr ""
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6553,113 +6553,113 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "chyba pri ��tan� bloku k���a: %s\n"
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' je u� skomprimovan�\n"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 #, fuzzy
 msgid "generating new key\n"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
@@ -6668,7 +6668,7 @@ msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 #, fuzzy
 msgid "read options from file"
 msgstr "��tam mo�nosti z `%s'\n"
@@ -6750,131 +6750,139 @@ msgstr "gpg-agent protokol verzie %d nie je podporovan�\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent protokol verzie %d nie je podporovan�\n"
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "POZN�MKA: k��� bol revokovan�"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "nespr�vny certifik�t"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "K��� k dispoz�cii na: "
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "vytvori� revoka�n� certifik�t"
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Platnos� k���a vypr�ala!"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "vyp�sa� fingerprint"
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifikova� podpis"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6883,7 +6891,7 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA po�aduje pou�itie 160 bitov�ho hashovacieho algoritmu\n"
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6959,42 +6967,47 @@ msgstr ""
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
@@ -7047,191 +7060,191 @@ msgstr "chyba pri vytv�ran� hesla: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "zapisujem do '%s'\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[s�bor]|vytvori� podpis"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "vyp�sa� zoznam tajn�ch k���ov"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "nespr�vny certifik�t"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "nespr�vny certifik�t"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "nespr�vny certifik�t"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "zmeni� heslo"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 msgid "|NAME|use NAME as default recipient"
 msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 msgid "use the default key as default recipient"
 msgstr ""
 "pou�i� implicitn� k��� ako implicitn�ho\n"
 " adres�ta"
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr "v�bec nepou��va� termin�l"
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 msgid "force v3 signatures"
 msgstr "vyn�ti� podpisy verzie 3"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr "na �ifrovanie v�dy pou�i� MDC"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr "d�vkov� re�im: nikdy sa na ni� nep�ta�"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr "automaticky odpoveda� �no na v��inu ot�zok"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr "automaticky odpoveda� NIE na v��inu ot�zok"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "prida� tento s�bor k���ov do zoznamu\n"
 " pou��van�ch s�borov k���ov"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "add this secret keyring to the list"
 msgstr "prida� tento s�bor tajn�ch k���ov do zoznamu"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr "|MENO|pou�i MENO ako implicitn� tajn� k���"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 "|PO��TA�|pou�i tento server k���ov na vyh�ad�vanie\n"
 " k���ov"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|MENO|nastav znakov� sadu termin�lu na MENO"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ALG|pou�i� �ifrovac� algoritmus ALG"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|ALG|pou�i� hashovac� algoritmus ALG"
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 msgid "|N|use compress algorithm N"
 msgstr "|N|pou�i� kompresn� algoritmus N"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:521
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7242,36 +7255,36 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:615
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "nem��em sa pripoji� k `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nem��em zavrie� `%s': %s\n"
 
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7392,7 +7405,7 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
diff --git a/po/sv.po b/po/sv.po
index 53e9768f8..459dab435 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.6\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 2004-12-01 17:49+0100\n"
 "Last-Translator: Per Tunedal <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -104,8 +104,8 @@ msgstr "kan inte skapa \"%s\": %s\n"
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
@@ -220,13 +220,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "utförlig"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "var något tystare"
 
@@ -251,7 +251,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 #, fuzzy
 msgid "use a log file for the server"
@@ -310,7 +310,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 #, fuzzy
 msgid "Please report bugs to <"
@@ -319,7 +319,7 @@ msgstr ""
 "Rapportera gärna fel eller synpunkter på översättningen till <[email protected]>.\n"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ""
@@ -345,30 +345,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBS: inställningsfilen \"%s\" saknas\n"
 
 #: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
@@ -601,60 +601,60 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 #, fuzzy
 msgid "Yes"
 msgstr "ja"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "fel vid skapandet av lösenmening: %s\n"
 
 # Filnamn både med och utan fnuttar finns. lite ologiskt. Vill någon
 # fixa en patch?
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "Kan inte öppna fil: %s\n"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
@@ -1512,7 +1512,7 @@ msgstr "använder undernyckeln %08lX istället för huvudnyckeln %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "nyckel %08lX: hemlig nyckel utan öppen nyckel - hoppade över den\n"
 
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1528,28 +1528,28 @@ msgstr "|[fil]|skapa en signatur"
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartext-signatur"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "skapa signatur i en separat fil"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "endast symmetrisk kryptering"
 
 # gnupg dekrypterar data om inget kommando anges dvs. kommandot "decrypt" behöver inte användas.
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "dekryptera data (standard)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "verifiera en signatur"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "visa en lista på nycklar"
 
@@ -1562,15 +1562,15 @@ msgstr "visa en lista på nycklar och signaturer"
 msgid "list and check key signatures"
 msgstr "verifiera nyckelsignaturer"
 
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "visa en lista på nycklar och fingeravtryck"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "visa en lista på hemliga nycklar"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
@@ -1602,11 +1602,11 @@ msgstr "generera ett spärrcertifikat"
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "importera nycklar från en nyckelserver"
 
@@ -1643,7 +1643,7 @@ msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
 # Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1654,31 +1654,31 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera för NAMN"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr "använd denna användaridentitet för att signera eller dekryptera"
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sätt kompressionsnivån till N (0 för att stänga av kompression)"
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "använd som fil för utdata"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
@@ -1696,7 +1696,7 @@ msgstr ""
 
 # inställningar istället för flaggor?
 # Nej, här är det bruksanvisningen för kommandoraden.
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1704,7 +1704,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan för en komplett lista på alla kommandon och flaggor)\n"
 
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1745,7 +1745,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "vilken operation som utförs beror på programmets indata\n"
 
-#: g10/gpg.c:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1773,7 +1773,7 @@ msgstr "Komprimering: "
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
@@ -2034,7 +2034,7 @@ msgid "invalid auto-key-locate list\n"
 msgstr ""
 
 # Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
 
@@ -2078,11 +2078,11 @@ msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "för att kryptera meddelanden i --pgp2-läge krävs IDEA-insticksprogrammet\n"
 
-#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda krypteringsalgoritmen är felaktig\n"
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen är felaktig\n"
 
@@ -2329,7 +2329,7 @@ msgstr "ta nycklarna från denna nyckelring "
 msgid "make timestamp conflicts only a warning"
 msgstr "utfärda enbart en varning när tidsstämpeln är orimlig"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
@@ -6644,62 +6644,62 @@ msgstr ""
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "misslyckades med att radera nyckelblock: %s\n"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Sändning till nyckelservern misslyckades: %s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6707,113 +6707,113 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Fel vid skapande av `%s': %s\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "fel vid läsning av nyckelblock: %s\n"
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "fel: ogiltigt fingeravtryck\n"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' är redan komprimerad\n"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 #, fuzzy
 msgid "generating new key\n"
 msgstr "generera ett nytt nyckelpar"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -6822,7 +6822,7 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 #, fuzzy
 msgid "read options from file"
 msgstr "läser inställningar från \"%s\"\n"
@@ -6905,131 +6905,139 @@ msgstr "GPG-Agent protokoll version %d stöds inte\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "GPG-Agent protokoll version %d stöds inte\n"
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "OBS: nyckeln har spärrats"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "felaktigt certifikat"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Nyckeln tillgänglig hos: "
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "försök att verifiera den skapade signaturen misslyckades: %s\n"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "generera ett spärrcertifikat"
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Giltighetstiden för denna nyckel har gått ut!"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "visa fingeravtryck"
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "försök att verifiera den skapade signaturen misslyckades: %s\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifiera en signatur"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -7038,7 +7046,7 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA kräver att du använder en 160-bitars kontrollsummealgoritm\n"
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7114,42 +7122,47 @@ msgstr ""
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "felaktig kontrollsummealgoritm `%s'\n"
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "E-postadressen är ogiltig\n"
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "fel vid skapande av nyckelringen \"%s\": %s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "fel vid skapande av nyckelringen \"%s\": %s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
@@ -7202,189 +7215,189 @@ msgstr "fel vid skapandet av lösenmening: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "%s: fel vid läsning av katalogpost: %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[fil]|skapa en klartext-signatur"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "visa en lista på hemliga nycklar"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "felaktigt certifikat"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "ta bort nycklar från den öppna nyckelringen"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "felaktigt certifikat"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "felaktigt certifikat"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "ändra lösenmening"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMN|använd NAMN som förvald mottagare"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 msgid "use the default key as default recipient"
 msgstr "använd standardnyckeln som förvald mottagare"
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr "använd inte terminalen alls"
 
 # Alltså även för V4-nycklar. För att vara PGP-kompatibel.
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 msgid "force v3 signatures"
 msgstr "använd alltid v3-signaturer"
 
 # Framtvingar användning av mdc även vid äldre chiffer. Ej kompatibelt med pgp.
 # Cast-5 används som standard  vid symmetrisk kryptering. Detta kommando integritetskyddar då den krypterade filen. Onödigt om nyare chiffer angivits med --personal-cipher-preferences
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr "använd alltid en MDC vid kryptering"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr "batch-läge: fråga aldrig"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr "anta att svaret är ja på de flesta frågor"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr "anta att svaret är nej på de flesta frågor"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "add this keyring to the list of keyrings"
 msgstr "lägg till denna nyckelring till listan över nyckelringar"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "add this secret keyring to the list"
 msgstr "lägg till denna hemliga nyckelring till listan"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|VÄRD|använd denna nyckelserver för att slå upp nycklar"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMN|sätt teckentabellen för terminalen till NAMN"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr "|FIL|ladda tilläggsmodul FIL"
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMN|använd krypteringsalgoritmen NAMN"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMN|använd kontrollsummealgoritmen NAMN"
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 msgid "|N|use compress algorithm N"
 msgstr "|N|använd komprimeringsalgoritmen N"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid "Usage: gpgsm [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.
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:521
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7395,36 +7408,36 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "vilken operation som utförs beror på programmets indata\n"
 
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:615
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "kan inte ansluta till \"%s\": %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan inte stänga \"%s\": %s\n"
 
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7546,7 +7559,7 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "försök att verifiera den skapade signaturen misslyckades: %s\n"
diff --git a/po/tr.po b/po/tr.po
index 1adaac597..72282b95b 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 2005-03-16 07:30+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -85,8 +85,8 @@ msgstr "\"%s\" oluşturulamıyor: %s\n"
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
@@ -199,13 +199,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "çok detaylı"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "daha az detaylı"
 
@@ -230,7 +230,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 #, fuzzy
 msgid "use a log file for the server"
@@ -288,7 +288,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 #, fuzzy
 msgid "Please report bugs to <"
@@ -297,7 +297,7 @@ msgstr ""
 "çeviri hatalarını ise <[email protected]> adresine bildiriniz.\n"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ""
@@ -323,30 +323,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, 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:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
@@ -579,58 +579,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 #, fuzzy
 msgid "Yes"
 msgstr "evet"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
 
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "dosya açılamadı: %s\n"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "\"%s\" okunurken hata: %s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "geçerli anahtar bilgisi alınırken hata: %s\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "\"%s\" okunurken hata: %s\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "\"%s\" okunurken hata: %s\n"
@@ -1435,7 +1435,7 @@ msgstr "yardımcı anahtar %s, asıl anahtar %s yerine kullanılıyor\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "anahtar %s: genel anahtarsız gizli anahtar - atlandı\n"
 
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1451,27 +1451,27 @@ msgstr "|[dosya]|bir imza yapar"
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "bağımsız bir imza yapar"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "veriyi şifreler"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik şifre ile şifreler"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "bir imzayı doğrular"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "anahtarları listeler"
 
@@ -1483,15 +1483,15 @@ msgstr "anahtarları ve imzaları listeler"
 msgid "list and check key signatures"
 msgstr "anahtar imzalarını listeler ve sınar"
 
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "gizli anahtarları listeler"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
@@ -1523,11 +1523,11 @@ msgstr "bir yürürlükten kaldırma sertifikası üretir"
 msgid "export keys"
 msgstr "anahtarları gönderir"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
@@ -1563,7 +1563,7 @@ msgstr "güvence veritabanını günceller"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
 
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1574,31 +1574,31 @@ msgstr ""
 "Seçenekler:\n"
 " "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|İSİM|İSİM için şifreleme yapar"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr "imzalamak ya da şifre çözmek için bu kullanıcı kimliği kullanılır"
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 ise sıkıştırma yapılmaz)"
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullanır"
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "çıktı dosyası olarak kullanılır"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
@@ -1614,7 +1614,7 @@ msgstr "kesin OpenPGP davranışı etkin olur"
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x uyumlu iletiler üretilir"
 
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1622,7 +1622,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1662,7 +1662,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/gpg.c:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1690,7 +1690,7 @@ msgstr "Sıkıştırma: "
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
@@ -1945,7 +1945,7 @@ msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
@@ -1985,11 +1985,11 @@ msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
@@ -2218,7 +2218,7 @@ msgstr "anahtarlar bu anahtarlıktan alınır"
 msgid "make timestamp conflicts only a warning"
 msgstr "zaman damgası çelişkilerini uyarı olarak bildirir"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr "|FD|durum bilgisini bu FD'ye yazar"
 
@@ -6371,62 +6371,62 @@ msgstr ""
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "parmakizinin saklanması başarısız oldu: %s\n"
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "oluşturma tarihinin saklanması başarısız oldu: %s\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "anahtar okuması başarısız\n"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr "yanıt genel anahtar verisi içermiyor\n"
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr "yanıt RSA modülü içermiyor\n"
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr "yanıt RSA genel bileşenini içermiyor\n"
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN eylemcisi hata döndürdü: %s\n"
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d için PIN çok kısa; asgari uzunluk: %d\n"
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr "yönetici komutlarına erişim yapılandırılmamış\n"
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr "karttan CHV durumu alınırken hata\n"
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr "kart kalıcı olarak kilitli!\n"
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6435,108 +6435,108 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr "|A|Yönetici PIN'i"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Yeni Yönetici PIN'i"
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|N|New PIN"
 msgstr "|N|Yeni PIN"
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "yeni PIN alınırken hata: %s\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 msgid "error reading application data\n"
 msgstr "uygulama verisi okunurken hata\n"
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 msgid "error reading fingerprint DO\n"
 msgstr "parmakizi DO okunurken hata\n"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 msgid "key already exists\n"
 msgstr "anahtar zaten mevcut\n"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr "mevcut anahtar konulacak\n"
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 msgid "generating new key\n"
 msgstr "yeni anahtar üretiliyor\n"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, fuzzy, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "genel üs çok büyük (32 bitten fazla)\n"
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "anahtarın saklanması başarısız: %s\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr "anahtar üretilene kadar lütfen bekleyiniz ....\n"
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 msgid "generating key failed\n"
 msgstr "anahtar üretimi başarısızlığa uğradı\n"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "anahtar üretimi tamamlandı (%d saniye)\n"
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP kartının yapısı geçersiz (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s imzası, %s özümleme algoritması\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, fuzzy, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "PIN [yapılan imza: %lu]"
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
@@ -6545,7 +6545,7 @@ msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 #, fuzzy
 msgid "read options from file"
 msgstr "\"%s\"den seçenekler okunuyor\n"
@@ -6627,131 +6627,139 @@ msgstr "gpg-agent protokolü sürüm %d desteklenmiyor\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent protokolü sürüm %d desteklenmiyor\n"
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "gizli anahtarların ihracına izin verilmez\n"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "anahtarın saklanması başarısız: %s\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "BİLGİ: anahtar yürürlükten kaldırılmıştı"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "sertifika hatalı"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Anahtar burada:"
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Bu anahtarın kullanım süresi dolmuş!"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "CA parmak izi: "
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "bir imzayı doğrular"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6760,7 +6768,7 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA, 160 bitlik bir hash algoritması kullanılmasını gerektiriyor\n"
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6836,42 +6844,47 @@ msgstr ""
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "`%s' hash algoritması geçersiz\n"
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "geçerli bir E-posta adresi değil\n"
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "`%s' anahtar zinciri oluşturulurken hata: %s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "`%s' anahtar zinciri oluşturulurken hata: %s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
@@ -6924,186 +6937,186 @@ msgstr "anahtar parolası oluşturulurken hata: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "%s: dizin kaydını yazma hatası: %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[dosya]|bir imza yapar"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "gizli anahtarları listeler"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "sertifika hatalı"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "anahtarları genel anahtar zincirinden siler"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "sertifika hatalı"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "sertifika hatalı"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "register a smartcard"
 msgstr "bir akıllı karta bir anahtar ekler"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "anahtar parolasını değiştirir"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 msgid "|NAME|use NAME as default recipient"
 msgstr "|İSİM|öntanımlı alıcı olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 msgid "use the default key as default recipient"
 msgstr "öntanımlı alıcı olarak öntanımlı anahtar kullanılır"
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr "terminali hiç kullanma"
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 msgid "force v3 signatures"
 msgstr "v3 imzalarına zorlar"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr "şifreleme için daima bir MDC kullanılır"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr "önceden belirlenmiş işlemler kipi: hiç sormaz"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr "soruların çoğunda cevap evet farzedilir"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr "soruların çoğunda cevap hayır farzedilir"
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 msgid "add this keyring to the list of keyrings"
 msgstr "bu anahtar zincirini anahtar zincirleri listesine ekler"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 msgid "add this secret keyring to the list"
 msgstr "bu gizli anahtar zincirini listeye ekler"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|MAKİNA|anahtarları aramak için bu anahtar sunucusu kullanılır"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|İSİM|terminal karakter setini İSİM olarak ayarlar"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSYA|genişletme modülü olarak DOSYA yüklenir"
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|İSİM|özümleme algoritması olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 msgid "|N|use compress algorithm N"
 msgstr "|N|sıkıştırma algoritması olarak N kullanılır"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:521
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7114,36 +7127,36 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:615
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "'%s' erişilemiyor: %s\n"
 
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7264,7 +7277,7 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0217965ed..7224d3605 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 2006-07-02 10:58+0800\n"
 "Last-Translator: Meng Jie <[email protected]>\n"
 "Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -89,8 +89,8 @@ msgstr "无法建立‘%s’：%s\n"
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "无法打开‘%s’： %s\n"
@@ -203,13 +203,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "详细模式"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "尽量减少提示信息"
 
@@ -234,7 +234,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 #, fuzzy
 msgid "use a log file for the server"
@@ -292,7 +292,7 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 #, fuzzy
 msgid "Please report bugs to <"
@@ -301,7 +301,7 @@ msgstr ""
 "请向 <[email protected]> 反映简体中文翻译的问题。\n"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ""
@@ -327,30 +327,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意：没有默认配置文件‘%s’\n"
 
 #: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
@@ -583,58 +583,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 #, fuzzy
 msgid "Yes"
 msgstr "yes"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "无法打开有签名的数据‘%s’\n"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "读取‘%s’时出错：%s\n"
@@ -1419,7 +1419,7 @@ msgstr "使用子钥 %s 而非主钥 %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
 
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1435,27 +1435,27 @@ msgstr "|[文件名]|生成一份签名"
 msgid "|[file]|make a clear text signature"
 msgstr "|[文件名]|生成一份明文签名"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "生成一份分离的签名"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "加密数据"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "仅使用对称加密"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "解密数据(默认)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "验证签名"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "列出密钥"
 
@@ -1467,15 +1467,15 @@ msgstr "列出密钥和签名"
 msgid "list and check key signatures"
 msgstr "列出并检查密钥签名"
 
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "列出密钥和指纹"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "列出私钥"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "生成一副新的密钥对"
 
@@ -1507,11 +1507,11 @@ msgstr "生成一份吊销证书"
 msgid "export keys"
 msgstr "导出密钥"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "把密钥导出到某个公钥服务器上"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "从公钥服务器上导入密钥"
 
@@ -1547,7 +1547,7 @@ msgstr "更新信任度数据库"
 msgid "|algo [files]|print message digests"
 msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
 
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1558,31 +1558,31 @@ msgstr ""
 "选项：\n"
 " "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr "输出经 ASCII 封装"
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr "使用这个用户标识来签名或解密"
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr "使用标准的文本模式"
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "指定输出文件"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "不做任何改变"
 
@@ -1598,7 +1598,7 @@ msgstr "行为严格遵循 OpenPGP 定义"
 msgid "generate PGP 2.x compatible messages"
 msgstr "生成与 PGP 2.x 兼容的报文"
 
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1606,7 +1606,7 @@ msgstr ""
 "@\n"
 "(请参考在线说明以获得所有命令和选项的完整清单)\n"
 
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1646,7 +1646,7 @@ msgstr ""
 "签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: g10/gpg.c:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1674,7 +1674,7 @@ msgstr "压缩："
 msgid "usage: gpg [options] "
 msgstr "用法：gpg [选项] "
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "冲突的指令\n"
 
@@ -1922,7 +1922,7 @@ msgstr "%s：%d：无效的 auto-key-locate 清单\n"
 msgid "invalid auto-key-locate list\n"
 msgstr "无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程序可能会创建核心内存转储！\n"
 
@@ -1962,11 +1962,11 @@ msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
@@ -2194,7 +2194,7 @@ msgstr "从这个钥匙环里取用密钥"
 msgid "make timestamp conflicts only a warning"
 msgstr "把时间戳矛盾仅视为警告"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr "|FD|把状态信息写入文件描述符 FD"
 
@@ -6193,62 +6193,62 @@ msgstr ""
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "无法存储指纹：%s\n"
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "无法存储创建日期：%s\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "无法读出公钥：%s\n"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr "响应未包含公钥数据\n"
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr "响应未包含 RSA 余数\n"
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr "响应未包含 RSA 公钥指数\n"
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN 回调返回错误：%s\n"
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "验证 CHV%d 失败：%s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr "尚未配置管理员命令的权限\n"
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr "从卡中获取 CHV 状态时出错\n"
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr "卡被永久锁定！\n"
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "尝试管理员 PIN %d 次后，卡将被永久锁定！\n"
@@ -6256,108 +6256,108 @@ msgstr "尝试管理员 PIN %d 次后，卡将被永久锁定！\n"
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr "|A|管理员 PIN"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新的管理员 PIN"
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|N|New PIN"
 msgstr "新的 PIN"
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "获取新 PIN 时出错：%s\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 msgid "error reading application data\n"
 msgstr "读取应用程序数据时出错\n"
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 msgid "error reading fingerprint DO\n"
 msgstr "读取指纹 D0 出错\n"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 msgid "key already exists\n"
 msgstr "密钥已存在\n"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr "现有的密钥将被替换\n"
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 msgid "generating new key\n"
 msgstr "生成新密钥\n"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr "缺少创建时间戳\n"
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 余数缺失或者不是 %d 位长\n"
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公钥指数缺失或长于 %d 位\n"
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
 
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "无法存储密钥：%s\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr "请稍候，正在生成密钥……\n"
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 msgid "generating key failed\n"
 msgstr "生成密钥失败\n"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "密钥已生成(耗时 %d 秒)\n"
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
 
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "卡不支持散列算法 %s\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前已创建的签名：%lu\n"
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前禁止通过此命令验证管理员 PIN\n"
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
@@ -6366,7 +6366,7 @@ msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 #, fuzzy
 msgid "read options from file"
 msgstr "从‘%s’读取选项\n"
@@ -6445,131 +6445,139 @@ msgstr "不支持 gpg-agent 协议版本 %d\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "不支持 gpg-agent 协议版本 %d\n"
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "无法打开‘%s’：%s\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "不允许导出私钥\n"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "无法存储密钥：%s\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "注意：密钥已被吊销"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "证书已损坏"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "可用的密钥在："
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "检查已建立的签名时发生错误： %s\n"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "生成一份吊销证书"
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 #, fuzzy
 msgid "certificate has expired"
 msgstr "这把密钥已经过期！"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "CA 指纹："
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "检查已建立的签名时发生错误： %s\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "验证签名"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6578,7 +6586,7 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA 要求使用 160 位的散列算法\n"
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6654,42 +6662,47 @@ msgstr ""
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "无效的‘%s’散列算法\n"
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "电子邮件地址无效\n"
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "建立钥匙环‘%s’时发生错误：%s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "建立钥匙环‘%s’时发生错误：%s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "生成密钥失败：%s\n"
@@ -6742,194 +6755,194 @@ msgstr "生成密码的时候发生错误：%s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "%s：写入目录记录时出错：%s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[文件名]|生成一份签名"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[文件名]|生成一份明文签名"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "列出私钥"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "证书已损坏"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "从公钥钥匙环里删除密钥"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "证书已损坏"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "证书已损坏"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "register a smartcard"
 msgstr "在智能卡上添加一把密钥"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "更改密码"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "输出经 ASCII 封装"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "已跳过：公钥已被设为默认收件者\n"
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "检查签名"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "从这个钥匙环里取用密钥"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "要有私钥才能这么做。\n"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "未知的对称加密算法"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s 签名，散列算法 %s\n"
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "未知的压缩算法"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:521
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -6940,36 +6953,36 @@ msgstr ""
 "签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:615
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "用法：gpg [选项] "
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "无法连接至‘%s’：%s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "无法存取‘%s’：%s\n"
 
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7090,7 +7103,7 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "检查已建立的签名时发生错误： %s\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 869433e1e..36e56113c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+0200\n"
 "PO-Revision-Date: 2005-07-29 09:49+0800\n"
 "Last-Translator: Jedi <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
@@ -87,8 +87,8 @@ msgstr "無法建立 `%s': %s\n"
 #: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
 #: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
 #: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
@@ -201,13 +201,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:182
 msgid "verbose"
 msgstr "囉唆模式"
 
 #: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
 msgid "be somewhat more quiet"
 msgstr "盡量安靜些"
 
@@ -232,7 +232,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
 #: tools/symcryptrun.c:184
 #, fuzzy
 msgid "use a log file for the server"
@@ -290,14 +290,14 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "請向 <[email protected]> 回報程式瑕疵.\n"
 
 #: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:222
 msgid ">.\n"
 msgstr ""
@@ -323,30 +323,30 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
 #: tools/symcryptrun.c:1053
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
 #: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項\n"
@@ -579,58 +579,58 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 #, fuzzy
 msgid "Yes"
 msgstr "yes"
 
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "無法開啟被簽署過的資料 `%s'\n"
 
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:446
+#: common/exechelp.c:452
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "取得現用金鑰資訊時發生錯誤: %s\n"
 
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: common/exechelp.c:487
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:498
+#: common/exechelp.c:504
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
@@ -1418,7 +1418,7 @@ msgstr "正在使用次鑰 %s 來替換主鑰 %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "金鑰 %s: 祇有私鑰而沒有公鑰 - 已跳過\n"
 
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1434,27 +1434,27 @@ msgstr "|[檔案]|建立一份簽章"
 msgid "|[file]|make a clear text signature"
 msgstr "|[檔案]|建立一份明文簽章"
 
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
 msgid "make a detached signature"
 msgstr "建立一份分離式簽章"
 
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
 msgid "encrypt data"
 msgstr "加密資料"
 
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
 msgid "encryption only with symmetric cipher"
 msgstr "僅使用對稱式編密法來加密"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
 msgid "decrypt data (default)"
 msgstr "資料解密 (預設)"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "verify a signature"
 msgstr "驗證某份簽章"
 
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
 msgid "list keys"
 msgstr "列出金鑰"
 
@@ -1466,15 +1466,15 @@ msgstr "列出金鑰和簽章"
 msgid "list and check key signatures"
 msgstr "列出並檢查金鑰簽章"
 
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
 msgid "list keys and fingerprints"
 msgstr "列出金鑰和指紋"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "list secret keys"
 msgstr "列出私鑰"
 
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
 msgid "generate a new key pair"
 msgstr "產生一份新的金鑰對"
 
@@ -1506,11 +1506,11 @@ msgstr "產生一份撤銷憑證"
 msgid "export keys"
 msgstr "匯出金鑰"
 
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
 msgid "export keys to a key server"
 msgstr "把金鑰匯出至某個金鑰伺服器上"
 
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
 msgid "import keys from a key server"
 msgstr "從某個金鑰伺服器上匯入金鑰"
 
@@ -1546,7 +1546,7 @@ msgstr "更新信任資料庫"
 msgid "|algo [files]|print message digests"
 msgstr "|演算法 [檔案]|印出訊息摘要"
 
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
 msgid ""
 "@\n"
@@ -1557,31 +1557,31 @@ msgstr ""
 "選項:\n"
 " "
 
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
 msgid "create ascii armored output"
 msgstr "建立以 ASCII 封裝過的輸出"
 
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
 msgid "|NAME|encrypt for NAME"
 msgstr "|名字|以「名字」作為加密對象"
 
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
 msgid "use this user-id to sign or decrypt"
 msgstr "使用這個使用者 ID 來簽署或解密"
 
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
 
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
 msgid "use canonical text mode"
 msgstr "使用標準的文字模式"
 
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "當作輸出檔案來使用"
 
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "不要做任何改變"
 
@@ -1597,7 +1597,7 @@ msgstr "使用嚴謹的 OpenPGP 行為"
 msgid "generate PGP 2.x compatible messages"
 msgstr "產生 PGP 2.x 相容性訊息"
 
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1605,7 +1605,7 @@ msgstr ""
 "@\n"
 "(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
 
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1643,7 +1643,7 @@ msgstr ""
 "簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: g10/gpg.c:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1671,7 +1671,7 @@ msgstr "壓縮: "
 msgid "usage: gpg [options] "
 msgstr "用法: gpg [選項] "
 
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
 msgid "conflicting commands\n"
 msgstr "指令彼此矛盾\n"
 
@@ -1926,7 +1926,7 @@ msgstr "%s:%d: 無效的驗證選項\n"
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程式可能會傾印出核心檔!\n"
 
@@ -1966,11 +1966,11 @@ msgstr "啟用 --pgp2 時妳祇應該使用檔案, 而非管道\n"
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 
-#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
@@ -2198,7 +2198,7 @@ msgstr "從這個鑰匙圈裡取用金鑰"
 msgid "make timestamp conflicts only a warning"
 msgstr "僅把時間戳印矛盾視為警告"
 
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
 msgid "|FD|write status info to this FD"
 msgstr "|檔案描述|把狀態資訊寫入此檔案描述"
 
@@ -6233,62 +6233,62 @@ msgstr ""
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "存放指紋失敗: %s\n"
 
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "存放創生資料失敗: %s\n"
 
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "讀取公鑰時失敗: %s\n"
 
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
 msgid "response does not contain the public key data\n"
 msgstr "回應中未包含公鑰資料\n"
 
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
 msgid "response does not contain the RSA modulus\n"
 msgstr "回應中未包含 RSA 系數\n"
 
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
 msgid "response does not contain the RSA public exponent\n"
 msgstr "回應中未包含 RSA 公用指數\n"
 
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "個人識別碼 (PIN) 收回時傳回錯誤: %s\n"
 
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "用於 CHV %d 的個人識別碼 (PIN) 太短; 長度最少要有 %d\n"
 
-#: scd/app-openpgp.c:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "驗證 CHV %d 失敗: %s\n"
 
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
 msgid "access to admin commands is not configured\n"
 msgstr "取用管理者指令尚未被組態過\n"
 
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
 msgid "error retrieving CHV status from card\n"
 msgstr "從卡片取回 CHV 狀態時出錯\n"
 
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
 msgid "card is permanently locked!\n"
 msgstr "卡片已被永久鎖住了!!\n"
 
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d 管理者個人識別碼 (PIN) 試圖在卡片被永久鎖定前遺留下來\n"
@@ -6296,108 +6296,108 @@ msgstr "%d 管理者個人識別碼 (PIN) 試圖在卡片被永久鎖定前遺�
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
 msgid "|A|Admin PIN"
 msgstr "|A|Admin PIN"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|AN|New Admin PIN"
 msgstr "|AN|New Admin PIN"
 
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
 msgid "|N|New PIN"
 msgstr "|N|New PIN"
 
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
 
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
 msgid "error reading application data\n"
 msgstr "讀取應用程式資料時出錯\n"
 
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
 msgid "error reading fingerprint DO\n"
 msgstr "讀取指紋 DO 時出錯\n"
 
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
 msgid "key already exists\n"
 msgstr "金鑰已存在\n"
 
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
 msgid "existing key will be replaced\n"
 msgstr "既有的金鑰將被取代\n"
 
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
 msgid "generating new key\n"
 msgstr "正在產生新的金鑰\n"
 
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
 msgid "creation timestamp missing\n"
 msgstr "建立的時間戳印缺漏\n"
 
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 模組缺漏或者尺寸並非 %d 位元\n"
 
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
 
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 質數 %s 缺漏或者尺寸並非 %d 位元\n"
 
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "存放金鑰失敗: %s\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
 msgid "please wait while key is being generated ...\n"
 msgstr "公鑰正被產生中, 請稍候 ...\n"
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
 msgid "generating key failed\n"
 msgstr "產生金鑰時失敗\n"
 
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "金鑰產生已完工 (%d 秒)\n"
 
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP 卡片的格式無效 (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s 簽章, 摘要演算法 %s\n"
 
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前建立的簽章: %lu\n"
 
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
 
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "管理者個人識別碼 (PIN) 之驗證目前在此指令中被禁止了\n"
 
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
@@ -6406,7 +6406,7 @@ msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
 #, fuzzy
 msgid "read options from file"
 msgstr "從 `%s' 讀取選項\n"
@@ -6485,131 +6485,139 @@ msgstr "gpg-agent 協定版本 %d 未被支援\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:115
+#: sm/certchain.c:159
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent 協定版本 %d 未被支援\n"
 
-#: sm/certchain.c:153
+#: sm/certchain.c:197
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:191
+#: sm/certchain.c:235
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:201
+#: sm/certchain.c:245
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
 
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "未被允許匯出私鑰\n"
 
-#: sm/certchain.c:352
+#: sm/certchain.c:396
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:372
+#: sm/certchain.c:416
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "存放金鑰失敗: %s\n"
 
-#: sm/certchain.c:616
+#: sm/certchain.c:660
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "請注意: 金鑰已經被撤銷了"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:669
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "損壞的憑證"
 
-#: sm/certchain.c:629
+#: sm/certchain.c:673
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "可用的金鑰於: "
 
-#: sm/certchain.c:631
+#: sm/certchain.c:675
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:636
+#: sm/certchain.c:680
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "檢查已建立的簽章時發生錯誤: %s\n"
 
-#: sm/certchain.c:714
+#: sm/certchain.c:758
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "產生一份撤銷憑證"
 
-#: sm/certchain.c:741
+#: sm/certchain.c:785
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:757
+#: sm/certchain.c:801
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:770
+#: sm/certchain.c:814
 #, fuzzy
 msgid "certificate has expired"
 msgstr "這把金鑰已經過期了!"
 
-#: sm/certchain.c:813
+#: sm/certchain.c:857
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:881
+#: sm/certchain.c:925
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:892
+#: sm/certchain.c:940
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "憑證中心 (CA) 指紋: "
 
-#: sm/certchain.c:897
+#: sm/certchain.c:948
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "檢查已建立的簽章時發生錯誤: %s\n"
 
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "驗證某份簽章"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6618,7 +6626,7 @@ msgstr ""
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA 要求使用 160 位元的雜湊演算法\n"
 
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6694,42 +6702,47 @@ msgstr ""
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
 #, fuzzy, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "無效的 `%s' 雜湊演算法\n"
 
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr ""
 
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr ""
 
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr ""
 
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr ""
 
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
 #, fuzzy, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "不是有效的電子郵件地址\n"
 
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "建立鑰匙圈 `%s' 時發生錯誤: %s\n"
+
+#: sm/certreqgen.c:560
 #, fuzzy, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "建立鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
 #, fuzzy, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "產生金鑰失敗: %s\n"
@@ -6782,194 +6795,194 @@ msgstr "建立密語的時候發生錯誤: %s\n"
 msgid "error writing to temporary file: %s\n"
 msgstr "%s: 寫入目錄記錄時錯誤: %s\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[檔案]|建立一份簽章"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[檔案]|建立一份明文簽章"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
 #, fuzzy
 msgid "list external keys"
 msgstr "列出私鑰"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
 #, fuzzy
 msgid "list certificate chain"
 msgstr "損壞的憑證"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "從公鑰鑰匙圈裡移去金鑰"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
 #, fuzzy
 msgid "import certificates"
 msgstr "損壞的憑證"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "export certificates"
 msgstr "損壞的憑證"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "register a smartcard"
 msgstr "加入某把金鑰至智慧卡"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
 msgid "run in server mode"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "change a passphrase"
 msgstr "更改密語"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "建立以 ASCII 封裝過的輸出"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "已跳過: 公鑰已經被設成預設收件者\n"
 
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "檢查簽章"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "從這個鑰匙圈裡取用金鑰"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "要有私鑰纔能這麼做.\n"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|名字|以「名字」作為加密對象"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "未知的編密演算法"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s 簽章, 摘要演算法 %s\n"
 
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "未知的壓縮演算法"
 
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:521
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -6980,36 +6993,36 @@ msgstr ""
 "簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:615
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "用法: gpg [選項] "
 
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "無法連接至 `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "無法存取 `%s': %s\n"
 
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7130,7 +7143,7 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:444
+#: sm/sign.c:447
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "檢查已建立的簽章時發生錯誤: %s\n"
diff --git a/scd/ChangeLog b/scd/ChangeLog
index 41a89b8b7..d584495c3 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,12 @@
+2006-10-17  Werner Koch  <[email protected]>
+
+	* Makefile.am (scdaemon_LDADD): Link against libcommonpth.
+
+2006-10-12  Werner Koch  <[email protected]>
+
+	* apdu.c: Include pth.h after unistd.h for the sake of newer Pth
+	versions.
+
 2006-10-11  Werner Koch  <[email protected]>
 
 	* app-openpgp.c (do_sign): Redirect to do_auth for OpenPGP.3.
diff --git a/scd/Makefile.am b/scd/Makefile.am
index 63356dba8..894016cf8 100644
--- a/scd/Makefile.am
+++ b/scd/Makefile.am
@@ -44,9 +44,9 @@ scdaemon_SOURCES = \
 	app.c app-common.h app-help.c $(card_apps)
 
 
-scdaemon_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \
+scdaemon_LDADD = ../jnlib/libjnlib.a ../common/libcommonpth.a ../gl/libgnu.a \
 	$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
-	$(LIBUSB_LIBS) -lgpg-error $(LIBINTL) $(DL_LIBS) $(NETLIBS)
+	$(LIBUSB_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(DL_LIBS) $(NETLIBS)
 
 # Removed for now: We need to decide whether it makes sense to
 # continue it at all, given that gpg has now all required
diff --git a/scd/apdu.c b/scd/apdu.c
index 01c48cdf0..242849adb 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -33,9 +33,9 @@
 #include <assert.h>
 #include <signal.h>
 #ifdef USE_GNU_PTH
-# include <pth.h>
 # include <unistd.h>
 # include <fcntl.h>
+# include <pth.h>
 #endif
 
 
diff --git a/sm/ChangeLog b/sm/ChangeLog
index 586a8882a..b135a63b7 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,5 +1,8 @@
 2006-10-17  Werner Koch  <[email protected]>
 
+	* gpgsm.c: No need for pth.h.  
+	(main): or to init it. It used to be hack for W32.
+
 	* sign.c (gpgsm_get_default_cert): Changed to return only
 	certificates usable for signing.
 
diff --git a/sm/Makefile.am b/sm/Makefile.am
index f3c4564b1..88bd0142d 100644
--- a/sm/Makefile.am
+++ b/sm/Makefile.am
@@ -22,8 +22,7 @@
 
 bin_PROGRAMS = gpgsm
 
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(KSBA_CFLAGS) \
-            $(PTH_CFLAGS)
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) 
 
 AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl 
 include $(top_srcdir)/am/cmacros.am
@@ -58,8 +57,8 @@ common_libs = ../jnlib/libjnlib.a ../kbx/libkeybox.a \
               ../common/libcommon.a ../gl/libgnu.a
 
 gpgsm_LDADD = $(common_libs) \
-              $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_LIBS) \
-               -lgpg-error  $(LIBINTL) $(PTH_LIBS) $(ZLIBS)
+              $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \
+              $(GPG_ERROR_LIBS) $(LIBINTL) $(ZLIBS)
 
 # Make sure that all libs are build before we use them.  This is
 # important for things like make -j2.
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 08251647b..8abae14b4 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -28,9 +28,7 @@
 #include <ctype.h>
 #include <unistd.h>
 #include <fcntl.h>
-#ifdef USE_GNU_PTH
-# include <pth.h>
-#endif
+
 
 #include "gpgsm.h"
 #include <gcrypt.h>
@@ -773,11 +771,6 @@ main ( int argc, char **argv)
                  NEED_KSBA_VERSION, ksba_check_version (NULL) );
     }
 
-#ifdef HAVE_W32_SYSTEM
-  /* For W32 we need pth.  */
-  pth_init ();
-#endif
-
 
   gcry_control (GCRYCTL_USE_SECURE_RNDPOOL);
 
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 5ed381049..0de5f3336 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-12  Werner Koch  <[email protected]>
+
+	* Makefile.am (gpg-zip, gpgsplit): Do not install due to a
+	conflict with gpg1.
+
 2006-10-11  Werner Koch  <[email protected]>
 
 	* gpgsm-gencert.sh: Allow generation of card keys.
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 41298503c..9aa2c4e85 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -33,7 +33,8 @@ sbin_SCRIPTS = addgnupghome
 
 bin_SCRIPTS = gpgsm-gencert.sh
 if HAVE_USTAR
-bin_SCRIPTS += gpg-zip
+# bin_SCRIPTS += gpg-zip
+noinst_SCRIPTS = gpg-zip
 endif
 
 if BUILD_SYMCRYPTRUN
@@ -43,12 +44,12 @@ else
 endif
 
 bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun} \
-	       gpgparsemail gpgsplit
+	       gpgparsemail
 if !HAVE_W32_SYSTEM
 bin_PROGRAMS += watchgnupg
 endif
 
-noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert
+noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit
 
 common_libs = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a
 pwquery_libs = ../common/libsimple-pwquery.a