Started to implement the audit log feature.

Pass PINENTRY_USER_DATA and XAUTHORITY to Pinentry.
Improved support for the quality bar.
Minor internal restructuring.
Translation fixes.

103 files changed, 17610 insertions, 15048 deletions

diff --git a/NEWS b/NEWS
index ce0654911..2a5b0acdd 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,9 @@ Noteworthy changes in version 2.0.8
 
  * New option --list-config for gpgconf.
 
+ * The envvars XAUTHORITY and PINENTRY_USER_DATA are now passed to the
+   pinentry.
+
 
 Noteworthy changes in version 2.0.7 (2007-09-10)
 ------------------------------------------------
diff --git a/agent/ChangeLog b/agent/ChangeLog
index e4a7f6863..7a4716c3d 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,28 @@
+2007-11-19  Werner Koch  <wk@g10code.com>
+
+	* call-pinentry.c (agent_askpin): Set the tooltip for the quality
+	bar.
+
+2007-11-15  Werner Koch  <wk@g10code.com>
+
+	* agent.h (struct server_control_s): Add XAUTHORITY and
+	PINENTRY_USER_DATA.
+	* gpg-agent.c: New option --xauthority.
+	(main, agent_init_default_ctrl) 
+	(agent_deinit_default_ctrl): Implemented
+	* command.c (cmd_updatestartuptty): Ditto.
+	* command-ssh.c (start_command_handler_ssh): Ditto.
+	* call-pinentry.c (atfork_cb): Set the environment.
+	(start_pinentry): Pass CTRL as arg to atfork_cb.
+
+2007-11-14  Werner Koch  <wk@g10code.com>
+
+	* call-scd.c (start_scd) [W32]: Take care of fflush peculiarities.
+
+2007-11-07  Werner Koch  <wk@g10code.com>
+
+	* agent.h: Remove errors.h.
+
 2007-10-24  Werner Koch  <wk@g10code.com>
 
 	* genkey.c (check_passphrase_constraints): Changed the wording of
diff --git a/agent/agent.h b/agent/agent.h
index 9648ac40a..beb70111e 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -31,7 +31,6 @@
 
 #include <gcrypt.h>
 #include "../common/util.h"
-#include "../common/errors.h"
 #include "../common/membuf.h"
 #include "../common/sysutils.h" /* (gnupg_fd_t) */
 
@@ -62,6 +61,8 @@ struct
   char *startup_ttytype;
   char *startup_lc_ctype;
   char *startup_lc_messages;
+  char *startup_xauthority;   
+  char *startup_pinentry_user_data; 
 
 
   const char *pinentry_program; /* Filename of the program to start as
@@ -146,6 +147,8 @@ struct server_control_s
   char *ttytype;
   char *lc_ctype;
   char *lc_messages;
+  char *xauthority;   
+  char *pinentry_user_data; 
   struct {
     int algo;
     unsigned char value[MAX_DIGEST_LEN];
diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c
index 2afe9f12a..6be9bfbe9 100644
--- a/agent/call-pinentry.c
+++ b/agent/call-pinentry.c
@@ -1,5 +1,5 @@
 /* call-pinentry.c - fork of the pinentry to query stuff from the user
- * Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2004, 2007 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -33,6 +33,7 @@
 #include <assuan.h>
 
 #include "agent.h"
+#include "setenv.h"
 #include "i18n.h"
 
 #ifdef _POSIX_OPEN_MAX
@@ -164,8 +165,16 @@ unlock_pinentry (int rc)
 static void
 atfork_cb (void *opaque, int where)
 {
+  ctrl_t ctrl = opaque;
+
   if (!where)
-    gcry_control (GCRYCTL_TERM_SECMEM);
+    {
+      gcry_control (GCRYCTL_TERM_SECMEM);
+      if (ctrl->xauthority)
+        setenv ("XAUTHORITY", ctrl->xauthority, 1);
+      if (ctrl->pinentry_user_data)
+        setenv ("PINENTRY_USER_DATA", ctrl->pinentry_user_data, 1 );
+    }
 }
 
 
@@ -261,9 +270,10 @@ start_pinentry (ctrl_t ctrl)
     }
   no_close_list[i] = -1;
 
-  /* Connect to the pinentry and perform initial handshaking */
+  /* Connect to the pinentry and perform initial handshaking.  Note
+     that atfork is used to change the environment for pinentry. */
   rc = assuan_pipe_connect_ext (&ctx, opt.pinentry_program, argv,
-                                no_close_list, atfork_cb, NULL, 0);
+                                no_close_list, atfork_cb, ctrl, 0);
   if (rc)
     {
       log_error ("can't connect to the PIN entry module: %s\n",
@@ -568,9 +578,47 @@ agent_askpin (ctrl_t ctrl,
      to the pinentry.  */
   if (pininfo->with_qualitybar && opt.min_passphrase_len )
     {
-      rc = assuan_transact (entry_ctx, "SETQUALITYBAR",
+      char *tmpstr;
+      const char *tooltip;
+
+      /* TRANSLATORS: This string is displayed by pinentry as the
+         label for the quality bar.  */
+      tmpstr = try_percent_escape (_("Quality:"), "\t\r\n\f\v");
+      snprintf (line, DIM(line)-1, "SETQUALITYBAR %s", tmpstr? tmpstr:"");
+      line[DIM(line)-1] = 0;
+      xfree (tmpstr);
+      rc = assuan_transact (entry_ctx, line,
                             NULL, NULL, NULL, NULL, NULL, NULL);
-      if (rc)
+      if (rc == 103 /*(Old assuan error code)*/
+          || gpg_err_code (rc) == GPG_ERR_ASS_UNKNOWN_CMD)
+        ; /* Ignore Unknown Command from old pinentry versions.  */
+      else if (rc)
+        return unlock_pinentry (rc);
+
+      /* TRANSLATORS: This string is a tooltip, shown by pinentry when
+         hovering over the quality bar.  Please use an appropriate
+         string to describe what this is about.  The length of the
+         tooltip is limited to about 900 characters.  If you do not
+         translate this entry, a default english text (see source)
+         will be used. */
+      tooltip =  _("pinentry.qualitybar.tooltip");
+      if (!strcmp ("pinentry.qualitybar.tooltip", tooltip))
+        tooltip = ("The quality of the text entered above.\n"
+                   "Please ask your administrator for "
+                   "details about the criteria.");
+      /* Fixme: As soon as we have the extended error reporting
+         facility (audit log), we can use a user specified helptext if
+         that has been configured. */
+      tmpstr = try_percent_escape (tooltip, "\t\r\n\f\v");
+      snprintf (line, DIM(line)-1, "SETQUALITYBAR_TT %s", tmpstr? tmpstr:"");
+      line[DIM(line)-1] = 0;
+      xfree (tmpstr);
+      rc = assuan_transact (entry_ctx, line,
+                            NULL, NULL, NULL, NULL, NULL, NULL);
+      if (rc == 103 /*(Old assuan error code)*/
+          || gpg_err_code (rc) == GPG_ERR_ASS_UNKNOWN_CMD)
+        ; /* Ignore Unknown Command from old pinentry versions.  */
+      else if (rc)
         return unlock_pinentry (rc);
     }
 
diff --git a/agent/call-scd.c b/agent/call-scd.c
index f0dd3ad27..42f3f8e12 100644
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
@@ -294,9 +294,17 @@ start_scd (ctrl_t ctrl)
       
   if (fflush (NULL))
     {
-      err = gpg_error (gpg_err_code_from_errno (errno));
+#ifndef HAVE_W32_SYSTEM
+      err = gpg_error_from_syserror ();
+#endif
       log_error ("error flushing pending output: %s\n", strerror (errno));
+      /* At least Windows XP fails here with EBADF.  According to docs
+         and Wine an fflush(NULL) is the same as _flushall.  However
+         the Wime implementaion does not flush stdin,stdout and stderr
+         - see above.  Lets try to ignore the error. */
+#ifndef HAVE_W32_SYSTEM
       goto leave;
+#endif
     }
 
   if (!opt.scdaemon_program || !*opt.scdaemon_program)
@@ -319,9 +327,11 @@ start_scd (ctrl_t ctrl)
     }
   no_close_list[i] = -1;
 
-  /* Connect to the pinentry and perform initial handshaking */
+  /* Connect to the pinentry and perform initial handshaking.  Use
+     detached flag (128) so that under W32 SCDAEMON does not show up a
+     new window.  */
   rc = assuan_pipe_connect_ext (&ctx, opt.scdaemon_program, argv,
-                                no_close_list, atfork_cb, NULL, 0);
+                                no_close_list, atfork_cb, NULL, 128);
   if (rc)
     {
       log_error ("can't connect to the SCdaemon: %s\n",
diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 48bf83238..9e2a57d6f 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -2871,6 +2871,10 @@ start_command_handler_ssh (ctrl_t ctrl, gnupg_fd_t sock_client)
     ctrl->lc_ctype = strdup (opt.startup_lc_ctype);
   if (!ctrl->lc_messages && opt.startup_lc_messages)
     ctrl->lc_messages = strdup (opt.startup_lc_messages);
+  if (!ctrl->xauthority && opt.startup_xauthority)
+    ctrl->xauthority = strdup (opt.startup_xauthority);
+  if (!ctrl->pinentry_user_data && opt.startup_pinentry_user_data)
+    ctrl->pinentry_user_data = strdup (opt.startup_pinentry_user_data);
 
 
   /* Create stream from socket.  */
diff --git a/agent/command.c b/agent/command.c
index 9be814880..c0c21bf79 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -1294,6 +1294,7 @@ cmd_updatestartuptty (assuan_context_t ctx, char *line)
   xfree (opt.startup_ttytype); opt.startup_ttytype = NULL;
   xfree (opt.startup_lc_ctype); opt.startup_lc_ctype = NULL;
   xfree (opt.startup_lc_messages); opt.startup_lc_messages = NULL;
+  xfree (opt.startup_xauthority); opt.startup_xauthority = NULL;
 
   if (ctrl->display)
     opt.startup_display = xtrystrdup (ctrl->display);
@@ -1305,6 +1306,10 @@ cmd_updatestartuptty (assuan_context_t ctx, char *line)
     opt.startup_lc_ctype = xtrystrdup (ctrl->lc_ctype);
   if (ctrl->lc_messages)
     opt.startup_lc_messages = xtrystrdup (ctrl->lc_messages);
+  if (ctrl->xauthority)
+    opt.startup_xauthority = xtrystrdup (ctrl->xauthority);
+  if (ctrl->pinentry_user_data)
+    opt.startup_pinentry_user_data = xtrystrdup (ctrl->pinentry_user_data);
 
   return 0;
 }
@@ -1442,6 +1447,22 @@ option_handler (assuan_context_t ctx, const char *key, const char *value)
       if (!ctrl->lc_messages)
         return out_of_core ();
     }
+  else if (!strcmp (key, "xauthority"))
+    {
+      if (ctrl->xauthority)
+        free (ctrl->xauthority);
+      ctrl->xauthority = strdup (value);
+      if (!ctrl->xauthority)
+        return out_of_core ();
+    }
+  else if (!strcmp (key, "pinentry-user-data"))
+    {
+      if (ctrl->pinentry_user_data)
+        free (ctrl->pinentry_user_data);
+      ctrl->pinentry_user_data = strdup (value);
+      if (!ctrl->pinentry_user_data)
+        return out_of_core ();
+    }
   else if (!strcmp (key, "use-cache-for-signing"))
     ctrl->server_local->use_cache_for_signing = *value? atoi (value) : 0;
   else
diff --git a/agent/genkey.c b/agent/genkey.c
index 8df555d51..efebbfa7e 100644
--- a/agent/genkey.c
+++ b/agent/genkey.c
@@ -232,7 +232,7 @@ check_passphrase_constraints (ctrl_t ctrl, const char *pw, int silent)
       check_passphrase_pattern (ctrl, pw))
     {
       const char *desc =
-        /* */     _("Warning: You have entered an insecure passphrase.%0A"
+        /* */     _("Warning: You have entered an insecure passphrase.%%0A"
                     "A passphrase may not be a known term or match%%0A"
                     "certain pattern.");
 
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index ba98b38aa..e4d8f3e13 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -81,6 +81,7 @@ enum cmd_and_opt_values
   oTTYtype,
   oLCctype,
   oLCmessages,
+  oXauthority,
   oScdaemonProgram,
   oDefCacheTTL,
   oDefCacheTTLSSH,
@@ -145,7 +146,8 @@ static ARGPARSE_OPTS opts[] = {
   { oTTYtype,    "ttytype",     2, "@" },
   { oLCctype,    "lc-ctype",    2, "@" },
   { oLCmessages, "lc-messages", 2, "@" },
-  { oKeepTTY, "keep-tty", 0,  N_("ignore requests to change the TTY")},
+  { oXauthority, "xauthority",  2, "@" },
+  { oKeepTTY,    "keep-tty",    0,  N_("ignore requests to change the TTY")},
   { oKeepDISPLAY, "keep-display",
                           0, N_("ignore requests to change the X display")},
 
@@ -217,6 +219,7 @@ static char *default_ttyname;
 static char *default_ttytype;
 static char *default_lc_ctype;
 static char *default_lc_messages;
+static char *default_xauthority;
 
 /* Name of a config file, which will be reread on a HUP if it is not NULL. */
 static char *config_filename;
@@ -559,6 +562,12 @@ main (int argc, char **argv )
   opt.startup_lc_messages = getenv ("LC_MESSAGES");
   if (opt.startup_lc_messages)
     opt.startup_lc_messages = xstrdup (opt.startup_lc_messages);
+  opt.startup_xauthority = getenv ("XAUTHORITY");
+  if (opt.startup_xauthority)
+    opt.startup_xauthority = xstrdup (opt.startup_xauthority);
+  opt.startup_pinentry_user_data = getenv ("PINENTRY_USER_DATA");
+  if (opt.startup_pinentry_user_data)
+    opt.startup_pinentry_user_data = xstrdup (opt.startup_pinentry_user_data);
 
   /* Check whether we have a config file on the commandline */
   orig_argc = argc;
@@ -662,6 +671,7 @@ main (int argc, char **argv )
         case oTTYtype: default_ttytype = xstrdup (pargs.r.ret_str); break;
         case oLCctype: default_lc_ctype = xstrdup (pargs.r.ret_str); break;
         case oLCmessages: default_lc_messages = xstrdup (pargs.r.ret_str);
+        case oXauthority: default_xauthority = xstrdup (pargs.r.ret_str);
           break;
 
         case oUseStandardSocket: standard_socket = 1; break;
@@ -1139,6 +1149,14 @@ agent_init_default_ctrl (ctrl_t ctrl)
   if (ctrl->lc_messages)
     free (ctrl->lc_messages);
   ctrl->lc_messages = default_lc_messages? strdup (default_lc_messages) : NULL;
+
+  if (ctrl->xauthority)
+    free (ctrl->xauthority);
+  ctrl->xauthority = default_xauthority? strdup (default_xauthority) : NULL;
+
+  if (ctrl->pinentry_user_data)
+    free (ctrl->pinentry_user_data);
+  ctrl->pinentry_user_data = NULL;
 }
 
 
@@ -1155,6 +1173,10 @@ agent_deinit_default_ctrl (ctrl_t ctrl)
     free (ctrl->lc_ctype);
   if (ctrl->lc_messages)
     free (ctrl->lc_messages);
+  if (ctrl->xauthority)
+    free (ctrl->xauthority);
+  if (ctrl->pinentry_user_data)
+    free (ctrl->pinentry_user_data);
 }
 
 /* Reread parts of the configuration.  Note, that this function is
diff --git a/common/ChangeLog b/common/ChangeLog
index b7c583797..9db29d908 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,21 @@
+2007-11-15  Werner Koch  <wk@g10code.com>
+
+	* asshelp.c (send_pinentry_environment): Add args XAUTHORITY and
+	PINENTRY_USER_DATA.
+	(start_new_gpg_agent): Ditto.
+
+2007-11-07  Werner Koch  <wk@g10code.com>
+
+	* status.h: New.
+	* errors.h: Remove.
+
+2007-11-05  Werner Koch  <wk@g10code.com>
+
+	* audit.c, audit.h: New. 
+	* Makefile.am: Add rules to build audit-events.h.
+	* exaudit.awk: New.
+	* mkstrtable.awk: New.  Taken from libgpg-error.
+
 2007-10-19  Werner Koch  <wk@g10code.com>
 
 	* i18n.c (i18n_switchto_utf8, i18n_switchback): New.
diff --git a/common/Makefile.am b/common/Makefile.am
index e5f7562b7..d475faeff 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,5 +1,5 @@
 # Makefile for common gnupg modules
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2007 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
 #
@@ -18,10 +18,15 @@
 
 ## Process this file with automake to produce Makefile.in
 
+EXTRA_DIST = mkstrtable.awk exaudit.awk exstatus.awk \
+             audit-events.h status-codes.h
+
 noinst_LIBRARIES = libcommon.a libcommonpth.a libsimple-pwquery.a libgpgrl.a
 noinst_PROGRAMS = $(module_tests)
 TESTS = $(module_tests)
 
+BUILT_SOURCES = audit-events.h status-codes.h
+
 AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl
 
 AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)
@@ -31,7 +36,7 @@ include $(top_srcdir)/am/cmacros.am
 common_sources = \
 	common-defs.h \
 	util.h i18n.c i18n.h \
-	errors.h \
+	status.c status.h\
 	openpgpdefs.h \
 	gc-opt-flags.h \
 	keyserver.h \
@@ -55,12 +60,14 @@ common_sources = \
 	exechelp.c exechelp.h \
 	signal.c \
 	estream.c estream.h estream-printf.c estream-printf.h \
+	audit.c audit.h \
 	srv.h \
 	dns-cert.c dns-cert.h \
 	pka.c pka.h \
 	http.c http.h 
 
 
+
 libcommon_a_SOURCES = $(common_sources)
 if USE_DNS_SRV
 libcommon_a_SOURCES += srv.c
@@ -80,6 +87,19 @@ libsimple_pwquery_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS)
 libgpgrl_a_SOURCES = \
         gpgrlhelp.c
 
+# Create the audit-events.h include file from audit.h
+audit-events.h: Makefile mkstrtable.awk exaudit.awk audit.h
+	$(AWK) -f $(srcdir)/exaudit.awk $(srcdir)/audit.h \
+	  | $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=3 -v nogettext=1 \
+		   -v namespace=eventstr_  >$@
+
+# Create the status-codes.h include file from status.h
+status-codes.h: Makefile mkstrtable.awk exstatus.awk status.h
+	$(AWK) -f $(srcdir)/exstatus.awk $(srcdir)/status.h \
+	  | $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=3 -v nogettext=1 \
+		   -v namespace=statusstr_  >$@
+
+
 #
 # Module tests
 #
@@ -92,3 +112,5 @@ t_convert_LDADD = $(t_common_ldadd)
 t_gettime_LDADD = $(t_common_ldadd)
 t_sysutils_LDADD = $(t_common_ldadd)
 
+
+
diff --git a/common/asshelp.c b/common/asshelp.c
index 269e897db..5aa61c773 100644
--- a/common/asshelp.c
+++ b/common/asshelp.c
@@ -1,5 +1,5 @@
 /* asshelp.c - Helper functions for Assuan
- * Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2002, 2004, 2007 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -31,7 +31,7 @@
 #include "util.h"
 #include "exechelp.h"
 #include "sysutils.h"
-#include "errors.h"  /* FIXME: This one conatisn only status code - rename it*/
+#include "status.h" 
 #include "asshelp.h"
 
 
@@ -56,7 +56,7 @@ send_one_option (assuan_context_t ctx, gpg_err_source_t errsource,
 }
 
 
-/* Send the assuan commands pertaining to the pinenry environment.  The
+/* Send the assuan commands pertaining to the pinentry environment.  The
    OPT_* arguments are optional and may be used to override the
    defaults taken from the current locale. */
 gpg_error_t
@@ -66,7 +66,9 @@ send_pinentry_environment (assuan_context_t ctx,
                            const char *opt_ttyname,
                            const char *opt_ttytype,
                            const char *opt_lc_ctype,
-                           const char *opt_lc_messages)
+                           const char *opt_lc_messages,
+                           const char *opt_xauthority,
+                           const char *opt_pinentry_user_data)
 {
   gpg_error_t err = 0;
   char *dft_display = NULL;
@@ -74,6 +76,8 @@ send_pinentry_environment (assuan_context_t ctx,
   char *dft_ttytype = NULL;
   char *old_lc = NULL; 
   char *dft_lc = NULL;
+  char *dft_xauthority = NULL;
+  char *dft_pinentry_user_data = NULL;
 
   /* Send the DISPLAY variable.  */
   dft_display = getenv ("DISPLAY");
@@ -162,6 +166,27 @@ send_pinentry_environment (assuan_context_t ctx,
   if (err)
     return err;
 
+  /* Send the XAUTHORITY variable.  */
+  dft_xauthority = getenv ("XAUTHORITY");
+  if (opt_xauthority || dft_xauthority)
+    {
+      err = send_one_option (ctx, errsource, "xauthority", 
+                             opt_xauthority ? opt_xauthority : dft_xauthority);
+      if (err)
+        return err;
+    }
+
+  /* Send the PINENTRY_USER_DATA variable.  */
+  dft_pinentry_user_data = getenv ("PINENTRY_USER_DATA");
+  if (opt_pinentry_user_data || dft_pinentry_user_data)
+    {
+      err = send_one_option (ctx, errsource, "pinentry-user-data", 
+                             opt_pinentry_user_data ?
+                             opt_pinentry_user_data : dft_pinentry_user_data);
+      if (err)
+        return err;
+    }
+
   return 0;
 }
 
@@ -179,6 +204,8 @@ start_new_gpg_agent (assuan_context_t *r_ctx,
                      const char *opt_ttytype,
                      const char *opt_lc_ctype,
                      const char *opt_lc_messages,
+                     const char *opt_xauthority,
+                     const char *opt_pinentry_user_data,
                      int verbose, int debug,
                      gpg_error_t (*status_cb)(ctrl_t, int, ...),
                      ctrl_t status_cb_arg)
@@ -333,7 +360,9 @@ start_new_gpg_agent (assuan_context_t *r_ctx,
   if (!rc)
     rc = send_pinentry_environment (ctx, errsource,
                                     opt_display, opt_ttyname, opt_ttytype,
-                                    opt_lc_ctype, opt_lc_messages);
+                                    opt_lc_ctype, opt_lc_messages,
+                                    opt_xauthority,
+                                    opt_pinentry_user_data);
   if (rc)
     {
       assuan_disconnect (ctx);
diff --git a/common/asshelp.h b/common/asshelp.h
index eb5a41c1d..dfed3ac50 100644
--- a/common/asshelp.h
+++ b/common/asshelp.h
@@ -1,5 +1,5 @@
 /* asshelp.h - Helper functions for Assuan
- *	Copyright (C) 2004 Free Software Foundation, Inc.
+ *	Copyright (C) 2004, 2007 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -30,7 +30,9 @@ send_pinentry_environment (assuan_context_t ctx,
                            const char *opt_ttyname,
                            const char *opt_ttytype,
                            const char *opt_lc_ctype,
-                           const char *opt_lc_messages);
+                           const char *opt_lc_messages,
+                           const char *opt_xauthority,
+                           const char *opt_pinentry_user_data);
 
 /* This fucntion is used by the call-agent.c modules to fire up a new
    agent.  What a parameter list ;-).  */
@@ -44,6 +46,8 @@ start_new_gpg_agent (assuan_context_t *r_ctx,
                      const char *opt_ttytype,
                      const char *opt_lc_ctype,
                      const char *opt_lc_messages,
+                     const char *opt_xauthority,
+                     const char *opt_pinentry_user_data,
                      int verbose, int debug,
                      gpg_error_t (*status_cb)(ctrl_t, int, ...),
                      ctrl_t status_cb_arg);
diff --git a/common/audit.c b/common/audit.c
new file mode 100644
index 000000000..baa7d8d51
--- /dev/null
+++ b/common/audit.c
@@ -0,0 +1,336 @@
+/* audit.c - GnuPG's audit subsystem
+ *	Copyright (C) 2007 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <stdlib.h>
+
+
+#include "util.h"
+#include "audit.h"
+#include "audit-events.h"
+
+/* One log entry.  */
+struct log_item_s
+{
+  audit_event_t event; /* The event.  */
+  gpg_error_t err;     /* The logged error code.  */
+  int intvalue;        /* A logged interger value.  */
+  char *string;        /* A malloced string or NULL.  */
+  ksba_cert_t cert;    /* A certifciate or NULL. */
+  int have_err:1;
+  int have_intvalue:1;
+};
+typedef struct log_item_s *log_item_t;
+
+
+
+/* The main audit object.  */
+struct audit_ctx_s
+{
+  const char *failure;  /* If set a description of the internal failure.  */
+  audit_type_t type;
+  
+  log_item_t log;       /* The table with the log entries.  */
+  size_t logsize;       /* The allocated size for LOG.  */
+  size_t logused;       /* The used size of LOG.  */
+
+};
+
+
+
+
+static const char *
+event2str (audit_event_t event)
+{
+  int idx = eventstr_msgidxof (event);
+  if (idx == -1)
+    return "Unknown event";
+  else
+    return eventstr_msgstr + eventstr_msgidx[idx];
+}
+
+
+
+/* Create a new audit context.  In case of an error NULL is returned
+   and errno set appropriately. */ 
+audit_ctx_t
+audit_new (void)
+{
+  audit_ctx_t ctx;
+
+  ctx = xtrycalloc (1, sizeof *ctx);
+
+  return ctx;
+}
+
+
+/* Release an audit context.  Passing NULL for CTX is allowed and does
+   nothing.  */
+void
+audit_release (audit_ctx_t ctx)
+{
+  int idx;
+  if (!ctx)
+    return;
+  if (ctx->log)
+    {
+      for (idx=0; idx < ctx->logused; idx++)
+        {
+          if (ctx->log[idx].string)
+            xfree (ctx->log[idx].string);
+          if (ctx->log[idx].cert)
+            ksba_cert_release (ctx->log[idx].cert);
+        }
+      xfree (ctx->log);
+    }
+  xfree (ctx);
+}
+
+
+/* Set the type for the audit operation.  If CTX is NULL, this is a
+   dummy fucntion.  */
+void
+audit_set_type (audit_ctx_t ctx, audit_type_t type)
+{
+  if (!ctx || ctx->failure)
+    return;  /* Audit not enabled or an internal error has occurred. */
+
+  if (ctx->type && ctx->type != type)
+    {
+      ctx->failure = "conflict in type initialization";
+      return;
+    }
+  ctx->type = type;
+}
+
+
+/* Create a new log item and put it into the table.  Return that log
+   item on success; return NULL on memory failure and mark that in
+   CTX. */
+static log_item_t
+create_log_item (audit_ctx_t ctx)
+{
+  log_item_t item, table;
+  size_t size;
+
+  if (!ctx->log)
+    {
+      size = 10;
+      table = xtrymalloc (size * sizeof *table);
+      if (!table)
+        {
+          ctx->failure = "Out of memory in create_log_item";
+          return NULL;
+        }
+      ctx->log = table;
+      ctx->logsize = size;
+      item = ctx->log + 0;
+      ctx->logused = 1;
+    }
+  else if (ctx->logused >= ctx->logsize)
+    {
+      size = ctx->logsize + 10;
+      table = xtryrealloc (ctx->log, size * sizeof *table);
+      if (!table)
+        {
+          ctx->failure = "Out of memory while reallocating in create_log_item";
+          return NULL;
+        }
+      ctx->log = table;
+      ctx->logsize = size;
+      item = ctx->log + ctx->logused++;
+    }
+  else
+    item = ctx->log + ctx->logused++;
+
+  item->event = AUDIT_NULL_EVENT;
+  item->err = 0;
+  item->have_err = 0;
+  item->intvalue = 0;
+  item->have_intvalue = 0;
+  item->string = NULL;
+  item->cert = NULL;
+
+  return item;
+ 
+}
+
+/* Add a new event to the audit log.  If CTX is NULL, this function
+   does nothing.  */
+void
+audit_log (audit_ctx_t ctx, audit_event_t event)
+{
+  log_item_t item;
+
+  if (!ctx || ctx->failure)
+    return;  /* Audit not enabled or an internal error has occurred. */
+  if (!event)
+    {
+      ctx->failure = "Invalid event passed to audit_log";
+      return;
+    }
+  if (!(item = create_log_item (ctx)))
+    return;
+  item->event = event;
+}
+
+/* Add a new event to the audit log.  If CTX is NULL, this function
+   does nothing.  This version also adds the result of the oepration
+   to the log.. */
+void
+audit_log_ok (audit_ctx_t ctx, audit_event_t event, gpg_error_t err)
+{
+  log_item_t item;
+
+  if (!ctx || ctx->failure)
+    return;  /* Audit not enabled or an internal error has occurred. */
+  if (!event)
+    {
+      ctx->failure = "Invalid event passed to audit_log_ok";
+      return;
+    }
+  if (!(item = create_log_item (ctx)))
+    return;
+  item->event = event;
+  item->err = err;
+  item->have_err = 1;
+}
+
+
+/* Add a new event to the audit log.  If CTX is NULL, this function
+   does nothing.  This version also add the integer VALUE to the log.  */
+void
+audit_log_i (audit_ctx_t ctx, audit_event_t event, int value)
+{
+  log_item_t item;
+
+  if (!ctx || ctx->failure)
+    return;  /* Audit not enabled or an internal error has occurred. */
+  if (!event)
+    {
+      ctx->failure = "Invalid event passed to audit_log_i";
+      return;
+    }
+  if (!(item = create_log_item (ctx)))
+    return;
+  item->event = event;
+  item->intvalue = value;
+  item->have_intvalue = 1;
+}
+
+
+/* Add a new event to the audit log.  If CTX is NULL, this function
+   does nothing.  This version also add the integer VALUE to the log.  */
+void
+audit_log_s (audit_ctx_t ctx, audit_event_t event, const char *value)
+{
+  log_item_t item;
+  char *tmp;
+
+  if (!ctx || ctx->failure)
+    return;  /* Audit not enabled or an internal error has occurred. */
+  if (!event)
+    {
+      ctx->failure = "Invalid event passed to audit_log_s";
+      return;
+    }
+  tmp = xtrystrdup (value? value : "");
+  if (!tmp)
+    {
+      ctx->failure = "Out of memory in audit_event";
+      return;
+    }
+  if (!(item = create_log_item (ctx)))
+    {
+      xfree (tmp);
+      return;
+    }
+  item->event = event;
+  item->string = tmp;
+}
+
+/* Add a new event to the audit log.  If CTX is NULL, this function
+   does nothing.  This version also adds the certificate CERT and the
+   result of an operation to the log.  */
+void
+audit_log_cert (audit_ctx_t ctx, audit_event_t event, 
+                ksba_cert_t cert, gpg_error_t err)
+{
+  log_item_t item;
+
+  if (!ctx || ctx->failure)
+    return;  /* Audit not enabled or an internal error has occurred. */
+  if (!event)
+    {
+      ctx->failure = "Invalid event passed to audit_log_cert";
+      return;
+    }
+  if (!(item = create_log_item (ctx)))
+    return;
+  item->event = event;
+  item->err = err;
+  item->have_err = 1;
+  if (cert)
+    {
+      ksba_cert_ref (cert); 
+      item->cert = cert;
+    }
+}
+
+
+
+/* Print the formatted audit result.    THIS IS WORK IN PROGRESS.  */
+void
+audit_print_result (audit_ctx_t ctx, FILE *fp)
+{
+  int idx;
+  int maxlen;
+  size_t n;
+
+  if (!ctx)
+    return;
+  if (!ctx->log || !ctx->logused)
+    {
+      fprintf (fp, "AUDIT-LOG: No entries\n");
+      return;
+    }
+
+  for (idx=0,maxlen=0; idx < DIM (eventstr_msgidx); idx++)
+    {
+      n = strlen (eventstr_msgstr + eventstr_msgidx[idx]);    
+      if (n > maxlen)
+        maxlen = n;
+    }
+
+  for (idx=0; idx < ctx->logused; idx++)
+    {
+      fprintf (fp, "AUDIT-LOG[%d]: %-*s", 
+               idx, maxlen, event2str (ctx->log[idx].event));
+      if (ctx->log[idx].have_intvalue)
+        fprintf (fp, " i=%d", ctx->log[idx].intvalue); 
+      if (ctx->log[idx].string)
+        fprintf (fp, " s=`%s'", ctx->log[idx].string); 
+      if (ctx->log[idx].cert)
+        fprintf (fp, " has_cert"); 
+      if (ctx->log[idx].have_err)
+        fprintf (fp, " err=\"%s\"", gpg_strerror (ctx->log[idx].err)); 
+      putc ('\n', fp);
+    }
+}
+
diff --git a/common/audit.h b/common/audit.h
new file mode 100644
index 000000000..ca7b70405
--- /dev/null
+++ b/common/audit.h
@@ -0,0 +1,139 @@
+/* audit.h - Definitions for the audit subsystem
+ *	Copyright (C) 2007 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GNUPG_COMMON_AUDIT_H
+#define GNUPG_COMMON_AUDIT_H
+
+#include <ksba.h>
+
+
+struct audit_ctx_s;
+typedef struct audit_ctx_s *audit_ctx_t;
+
+/* Constants for the audit type.  */
+typedef enum
+  {
+    AUDIT_TYPE_NONE  = 0,  /* No type set.  */
+    AUDIT_TYPE_VERIFY      /* Signature verification.  */
+  }
+audit_type_t;
+
+/* The events we support.  */
+typedef enum
+  {
+    AUDIT_NULL_EVENT = 0,
+    /* No such event.  Its value shall be 0 and no other values shall
+       be assigned to the other enum symbols.  This is required so
+       that the exaudit.awk script comes up with correct values
+       without running cc.  */
+
+    AUDIT_SETUP_READY,
+    /* All preparations done so that the actual processing can start
+       now.  This indicates that all parameters are okay and we can
+       start to process the actual data.  */
+
+    AUDIT_DETACHED_SIGNATURE,
+    /* The signature is a detached one. */
+
+    AUDIT_CERT_ONLY_SIG,
+    /* A certifciate only signature has been detected.  */
+
+    AUDIT_DATA_HASH_ALGO,  /* int */
+    /* The hash algo given as argument is used for this signature.
+       This event will be repeated for all hash algorithms used with
+       the data.  */
+
+    AUDIT_BAD_DATA_HASH_ALGO,  /* string */
+    /* The hash algo as specified by the signature can't be used.
+       STRING is the description of this algorithm which usually is an
+       OID string.  STRING may be NULL. */
+
+    AUDIT_DATA_HASHING,    /* ok_err */
+    /* Logs the result of the data hashing. */
+
+    AUDIT_READ_ERROR,     /* ok_err */
+    /* A generic read error occurred.  */
+
+    AUDIT_WRITE_ERROR,     /* ok_err */
+    /* A generic write error occurred.  */
+
+    AUDIT_USAGE_ERROR,
+    /* The program was used in an inappropriate way; For example by
+       passing a data object while the signature does not expect one
+       or vice versa.  */
+    
+    AUDIT_SAVE_CERT,       /* cert, ok_err */
+    /* Save the certificate received in a message. */
+
+    AUDIT_NEW_SIG,         /* int */
+    /* Start the verification of a new signature for the last data
+       object.  The argument is the signature number as used
+       internally by the program.  */
+    
+    AUDIT_SIG_NAME,        /* string */
+    /* The name of a signer.  This is the name or other identification
+       data as known from the signature and not the name from the
+       certificate used for verification.  An example for STRING when
+       using CMS is:b "#1234/CN=Prostetnic Vogon Jeltz".  */
+
+    AUDIT_SIG_STATUS,     /* string */
+    /* The signature status of the current signer.  This is the last
+       audit information for one signature.  STRING gives the status:
+
+         "error"       - there was a problem checking this or any signature.
+         "unsupported" - the signature type is not supported. 
+         "no-cert"     - The certificate of the signer was not found (the
+                         S/N+issuer of the signer is already in the log).
+         "bad"         - bad signature
+         "good"        - good signature
+    */
+
+    AUDIT_VALIDATE_CHAIN,
+    /* Start the validation of a certificate chain. */
+
+    AUDIT_CHAIN_BEGIN,
+    AUDIT_CHAIN_CERT,    /* cert */
+    AUDIT_CHAIN_ROOTCERT,/* cert */
+    AUDIT_CHAIN_END,
+    /* These 4 events are used to log the certificates making up a
+       certificate chain.  ROOTCERT is used for the trustanchor and
+       CERT for all other certificates.  */ 
+
+
+
+    AUDIT_LAST_EVENT  /* Marker for parsing this list.  */
+  }
+audit_event_t;
+
+
+audit_ctx_t audit_new (void);
+void audit_release (audit_ctx_t ctx);
+void audit_set_type (audit_ctx_t ctx, audit_type_t type);
+void audit_log (audit_ctx_t ctx, audit_event_t event);
+void audit_log_ok (audit_ctx_t ctx, audit_event_t event, gpg_error_t err);
+void audit_log_i (audit_ctx_t ctx, audit_event_t event, int value);
+void audit_log_s (audit_ctx_t ctx, audit_event_t event, const char *value);
+void audit_log_cert (audit_ctx_t ctx, audit_event_t event, 
+                     ksba_cert_t cert, gpg_error_t err);
+
+void audit_print_result (audit_ctx_t ctx, FILE *fp);
+
+
+
+#endif /*GNUPG_COMMON_AUDIT_H*/
diff --git a/common/errors.h b/common/errors.h
deleted file mode 100644
index 7ce199692..000000000
--- a/common/errors.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* errors.h - Globally used error codes
- *	Copyright (C) 2001 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GNUPG_COMMON_ERRORS_H
-#define GNUPG_COMMON_ERRORS_H
-
-#include "util.h"
-
-/* Status codes - fixme: should go into another file */
-enum {
-  STATUS_ENTER,
-  STATUS_LEAVE,
-  STATUS_ABORT,
-  STATUS_GOODSIG,
-  STATUS_BADSIG,
-  STATUS_ERRSIG,
-  STATUS_BADARMOR,
-  STATUS_RSA_OR_IDEA,
-  STATUS_SIGEXPIRED,
-  STATUS_KEYREVOKED,
-  STATUS_TRUST_UNDEFINED,
-  STATUS_TRUST_NEVER,
-  STATUS_TRUST_MARGINAL,
-  STATUS_TRUST_FULLY,
-  STATUS_TRUST_ULTIMATE,
-  
-  STATUS_SHM_INFO,
-  STATUS_SHM_GET,
-  STATUS_SHM_GET_BOOL,
-  STATUS_SHM_GET_HIDDEN,
-  
-  STATUS_NEED_PASSPHRASE,
-  STATUS_VALIDSIG,
-  STATUS_SIG_ID,
-  STATUS_ENC_TO,
-  STATUS_NODATA,
-  STATUS_BAD_PASSPHRASE,
-  STATUS_NO_PUBKEY,
-  STATUS_NO_SECKEY,
-  STATUS_NEED_PASSPHRASE_SYM,
-  STATUS_DECRYPTION_FAILED,
-  STATUS_DECRYPTION_OKAY,
-  STATUS_MISSING_PASSPHRASE,
-  STATUS_GOOD_PASSPHRASE,
-  STATUS_GOODMDC,
-  STATUS_BADMDC,
-  STATUS_ERRMDC,
-  STATUS_IMPORTED,
-  STATUS_IMPORT_OK,
-  STATUS_IMPORT_PROBLEM,
-  STATUS_IMPORT_RES,
-  STATUS_FILE_START,
-  STATUS_FILE_DONE,
-  STATUS_FILE_ERROR,
-  
-  STATUS_BEGIN_DECRYPTION,
-  STATUS_END_DECRYPTION,
-  STATUS_BEGIN_ENCRYPTION,
-  STATUS_END_ENCRYPTION,
-  
-  STATUS_DELETE_PROBLEM,
-  STATUS_GET_BOOL,
-  STATUS_GET_LINE,
-  STATUS_GET_HIDDEN,
-  STATUS_GOT_IT,
-  STATUS_PROGRESS,
-  STATUS_SIG_CREATED,
-  STATUS_SESSION_KEY,
-  STATUS_NOTATION_NAME,
-  STATUS_NOTATION_DATA,
-  STATUS_POLICY_URL,
-  STATUS_BEGIN_STREAM,
-  STATUS_END_STREAM,
-  STATUS_KEY_CREATED,
-  STATUS_USERID_HIN,
-  STATUS_UNEXPECTED,
-  STATUS_INV_RECP,
-  STATUS_NO_RECP,
-  STATUS_ALREADY_SIGNED,
-
-  STATUS_EXPSIG,
-  STATUS_EXPKEYSIG,
-
-  STATUS_TRUNCATED,
-  STATUS_ERROR,
-  STATUS_NEWSIG
-};
-
-
-/*-- errors.c (build by mkerror and mkerrtok) --*/
-const char *gnupg_strerror (int err);
-const char *gnupg_error_token (int err);
-
-
-#endif /*GNUPG_COMMON_ERRORS_H*/
diff --git a/common/exaudit.awk b/common/exaudit.awk
new file mode 100644
index 000000000..270e148b1
--- /dev/null
+++ b/common/exaudit.awk
@@ -0,0 +1,43 @@
+# exaudit.awk - Extract audit event codes from audit.h
+#	Copyright (C) 2007 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# GnuPG is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+BEGIN {
+  print "# Output of exaudit.awk - DO NOT EDIT."
+  topheader = 0;
+  okay = 0;
+  code = 0;
+}
+
+topheader == 0 && /^\/\*/  { topheader = 1 }
+topheader == 1             { print $0 }
+topheader == 1 && /\*\//   { topheader = 2; print "" }
+
+/AUDIT_NULL_EVENT/   { okay = 1 }
+!okay                { next }
+/AUDIT_LAST_EVENT/   { exit }
+/AUDIT_[A-Za-z_]+/  { 
+  sub (/[,\/\*]+/, "", $1);
+  desc = tolower (substr($1,7));
+  gsub (/_/," ",desc);
+  printf "%d\t%s\t%s\n", code, $1, desc;
+  code++;
+}
+
+END {
+  print "# end of audit codes."
+}
diff --git a/common/exstatus.awk b/common/exstatus.awk
new file mode 100644
index 000000000..ea48e8156
--- /dev/null
+++ b/common/exstatus.awk
@@ -0,0 +1,40 @@
+# exstatus.awk - Extract status codes from status.h
+#	Copyright (C) 2007 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# GnuPG is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+BEGIN {
+  print "# Created by exstatus.awk - DO NOT EDIT."
+  topheader = 0;
+  code = 0;
+}
+
+topheader == 0 && /^\/\*/  { topheader = 1 }
+topheader == 1             { print $0 }
+topheader == 1 && /\*\//   { topheader = 2; print "" }
+
+/^[ \t]+STATUS_[A-Za-z_]+/  { 
+  sub (/[,\/\*]+/, "", $1);
+  desc = substr($1,8);
+  printf "%d\t%s\t%s\n", code, $1, desc;
+  code++;
+}
+
+
+END {
+  print "# end of status codes."
+}
+
diff --git a/common/maperror.c b/common/maperror.c
deleted file mode 100644
index 1369a97bd..000000000
--- a/common/maperror.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* maperror.c - Error mapping
- *	Copyright (C) 2001, 2002 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#error This file is not anymore used.
-
-#include <config.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-
-#include <assuan.h>
-
-#include "util.h"
-#include "errors.h"
-
-
-
-/* Map Assuan error code ERR to an GPG_ERR_ code.  We need to
-   distinguish between genuine (and legacy) Assuan error codes and
-   application error codes shared with all GnuPG modules.  The rule is
-   simple: All errors with a gpg_err_source of UNKNOWN are genuine
-   Assuan codes all others are passed verbatim through. */
-gpg_error_t
-map_assuan_err_with_source (int source, int err)
-{
-  gpg_err_code_t ec;
-
-  if (gpg_err_source (err))
-    return err;
-
-  switch (err)
-    {
-    case -1:                     ec = GPG_ERR_EOF; break;
-    case 0:                      ec = 0; break;
-
-    case ASSUAN_Canceled:        ec = GPG_ERR_CANCELED; break;
-    case ASSUAN_Invalid_Index:   ec = GPG_ERR_INV_INDEX; break;
-
-    case ASSUAN_Not_Implemented: ec = GPG_ERR_NOT_IMPLEMENTED; break;
-    case ASSUAN_Server_Fault:    ec = GPG_ERR_ASSUAN_SERVER_FAULT; break;
-    case ASSUAN_No_Public_Key:   ec = GPG_ERR_NO_PUBKEY; break;
-    case ASSUAN_No_Secret_Key:   ec = GPG_ERR_NO_SECKEY; break;
-
-    case ASSUAN_Cert_Revoked:    ec = GPG_ERR_CERT_REVOKED; break;
-    case ASSUAN_No_CRL_For_Cert: ec = GPG_ERR_NO_CRL_KNOWN; break;       
-    case ASSUAN_CRL_Too_Old:     ec = GPG_ERR_CRL_TOO_OLD; break;        
-
-    case ASSUAN_Not_Trusted:     ec = GPG_ERR_NOT_TRUSTED; break;
-
-    case ASSUAN_Card_Error:      ec = GPG_ERR_CARD; break;
-    case ASSUAN_Invalid_Card:    ec = GPG_ERR_INV_CARD; break;
-    case ASSUAN_No_PKCS15_App:   ec = GPG_ERR_NO_PKCS15_APP; break;
-    case ASSUAN_Card_Not_Present: ec= GPG_ERR_CARD_NOT_PRESENT; break;
-    case ASSUAN_Not_Confirmed:   ec = GPG_ERR_NOT_CONFIRMED; break;
-    case ASSUAN_Invalid_Id:      ec = GPG_ERR_INV_ID; break;
-
-    case ASSUAN_Locale_Problem:  ec = GPG_ERR_LOCALE_PROBLEM; break;
-
-    default:
-      ec = err < 100? GPG_ERR_ASSUAN_SERVER_FAULT : GPG_ERR_ASSUAN;
-      break;
-    }
-  return gpg_err_make (source, ec);
-}
-
-/* Map GPG_xERR_xx error codes to Assuan status codes */
-int
-map_to_assuan_status (int rc)
-{
-  gpg_err_code_t   ec = gpg_err_code (rc);
-  gpg_err_source_t es = gpg_err_source (rc);
-
-  if (!rc)
-    return 0;
-  if (!es)
-    {
-      es = GPG_ERR_SOURCE_USER_4; /*  This should not happen, but we
-                                      need to make sure to pass a new
-                                      Assuan errorcode along. */
-      log_debug ("map_to_assuan_status called with no error source\n");
-    }
-
-  if (ec == -1)
-    ec = GPG_ERR_NO_DATA;  /* That used to be ASSUAN_No_Data_Available. */
-
-  return gpg_err_make (es, ec);
-}
diff --git a/common/mkstrtable.awk b/common/mkstrtable.awk
new file mode 100644
index 000000000..56e9bb881
--- /dev/null
+++ b/common/mkstrtable.awk
@@ -0,0 +1,185 @@
+# mkstrtable.awk
+# Copyright (C) 2003, 2004 g10 Code GmbH
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception, g10 Code GmbH gives unlimited permission to
+# copy, distribute and modify the C source files that are the output
+# of mkstrtable.awk.  You need not follow the terms of the GNU General
+# Public License when using or distributing such scripts, even though
+# portions of the text of mkstrtable.awk appear in them.  The GNU
+# General Public License (GPL) does govern all other use of the material
+# that constitutes the mkstrtable.awk program.
+#
+# Certain portions of the mkstrtable.awk source text are designed to be
+# copied (in certain cases, depending on the input) into the output of
+# mkstrtable.awk.  We call these the "data" portions.  The rest of the
+# mkstrtable.awk source text consists of comments plus executable code
+# that decides which of the data portions to output in any given case.
+# We call these comments and executable code the "non-data" portions.
+# mkstrtable.h never copies any of the non-data portions into its output.
+#
+# This special exception to the GPL applies to versions of mkstrtable.awk
+# released by g10 Code GmbH.  When you make and distribute a modified version
+# of mkstrtable.awk, you may extend this special exception to the GPL to
+# apply to your modified version as well, *unless* your modified version
+# has the potential to copy into its output some of the text that was the
+# non-data portion of the version that you started with.  (In other words,
+# unless your change moves or copies text from the non-data portions to the
+# data portions.)  If your modification has such potential, you must delete
+# any notice of this special exception to the GPL from your modified version.
+
+# This script outputs a source file that does define the following
+# symbols:
+#
+# static const char msgstr[];
+# A string containing all messages in the list.
+#
+# static const int msgidx[];
+# A list of index numbers, one for each message, that points to the
+# beginning of the string in msgstr.
+#
+# msgidxof (code);
+# A macro that maps code numbers to idx numbers.  If a DEFAULT MESSAGE
+# is provided (see below), its index will be returned for unknown codes.
+# Otherwise -1 is returned for codes that do not appear in the list.
+# You can lookup the message with code CODE with:
+# msgstr + msgidx[msgidxof (code)].
+#
+# The input file has the following format:
+# CODE1	...	MESSAGE1	(code nr, <tab>, something, <tab>, msg)
+# CODE2	...	MESSAGE2	(code nr, <tab>, something, <tab>, msg)
+# ...
+# CODEn	...	MESSAGEn	(code nr, <tab>, something, <tab>, msg)
+# 	...	DEFAULT-MESSAGE	(<tab>, something, <tab>, fall-back msg)
+#
+# Comments (starting with # and ending at the end of the line) are removed,
+# as is trailing whitespace.  The last line is optional; if no DEFAULT
+# MESSAGE is given, msgidxof will return the number -1 for unknown
+# index numbers.
+#
+# The field to be used is specified with the variable "textidx" on
+# the command line.  It defaults to 2.
+#
+# The variable nogettext can be set to 1 to suppress gettext markers.
+#
+# The variable prefix can be used to prepend a string to each message.
+#
+# The variable namespace can be used to prepend a string to each
+# variable and macro name.
+
+BEGIN {
+  FS = "[\t]+";
+# cpos holds the current position in the message string.
+  cpos = 0;
+# msg holds the number of messages.
+  msg = 0;
+  print "/* Output of mkstrtable.awk.  DO NOT EDIT.  */";
+  print "";
+  header = 1;
+  if (textidx == 0)
+    textidx = 2;
+# nogettext can be set to 1 to suppress gettext noop markers.
+}
+
+/^#/ { next; }
+
+header {
+  if ($1 ~ /^[0123456789]+$/)
+    {
+      print "/* The purpose of this complex string table is to produce";
+      print "   optimal code with a minimum of relocations.  */";
+      print "";
+      print "static const char " namespace "msgstr[] = ";
+      header = 0;
+    }
+  else
+    print;
+}
+
+!header {
+  sub (/\#.+/, "");
+  sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+
+  if (/^$/)
+    next;
+
+# Print the string msgstr line by line.  We delay output by one line to be able
+# to treat the last line differently (see END).
+  if (last_msgstr)
+    {
+      if (nogettext)
+	print "  \"" last_msgstr "\" \"\\0\"";
+      else
+	print "  gettext_noop (\"" last_msgstr "\") \"\\0\"";
+    }
+  last_msgstr = prefix $textidx;
+
+# Remember the error code and msgidx of each error message.
+  code[msg] = $1;
+  pos[msg] = cpos;
+  cpos += length (last_msgstr) + 1;
+  msg++;
+
+  if ($1 == "")
+    {
+      has_default = 1;
+      exit;
+    }
+}
+END {
+  if (has_default)
+    coded_msgs = msg - 1;
+  else
+    coded_msgs = msg;
+
+  if (nogettext)
+    print "  \"" prefix last_msgstr "\";";
+  else
+    print "  gettext_noop (\"" prefix last_msgstr "\");";
+  print "";
+  print "static const int " namespace "msgidx[] =";
+  print "  {";
+  for (i = 0; i < coded_msgs; i++)
+    print "    " pos[i] ",";
+  print "    " pos[coded_msgs];
+  print "  };";
+  print "";
+  print "#define " namespace "msgidxof(code) (0 ? -1 \\";
+
+# Gather the ranges.
+  skip = code[0];
+  start = code[0];
+  stop = code[0];
+  for (i = 1; i < coded_msgs; i++)
+    {
+      if (code[i] == stop + 1)
+	stop++;
+      else
+	{
+	  print "  : ((code >= " start ") && (code <= " stop ")) ? (code - " \
+            skip ") \\";
+	  skip += code[i] - stop - 1;
+	  start = code[i];
+	  stop = code[i];
+	}
+    }
+  print "  : ((code >= " start ") && (code <= " stop ")) ? (code - " \
+    skip ") \\";
+  if (has_default)
+    print "  : " stop + 1 " - " skip ")";
+  else
+    print "  : -1)";
+    
+ }
diff --git a/common/status.c b/common/status.c
new file mode 100644
index 000000000..7012edf03
--- /dev/null
+++ b/common/status.c
@@ -0,0 +1,38 @@
+/* status.c - status code helper functions
+ *	Copyright (C) 2007 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <stdlib.h>
+
+#include "util.h"
+#include "status.h"
+#include "status-codes.h"
+
+
+/* Return the status string for code NO. */
+const char *
+get_status_string ( int no ) 
+{
+  int idx = statusstr_msgidxof (no);
+  if (idx == -1)
+    return "?";
+  else
+    return statusstr_msgstr + statusstr_msgidx[idx];
+}
+
diff --git a/common/status.h b/common/status.h
new file mode 100644
index 000000000..50a11914a
--- /dev/null
+++ b/common/status.h
@@ -0,0 +1,132 @@
+/* status.h - Status codes
+ *	Copyright (C) 2007 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GNUPG_COMMON_STATUS_H
+#define GNUPG_COMMON_STATUS_H
+
+enum 
+  {
+    STATUS_ENTER,
+    STATUS_LEAVE,
+    STATUS_ABORT,
+
+    STATUS_GOODSIG,
+    STATUS_BADSIG,
+    STATUS_ERRSIG,
+
+    STATUS_BADARMOR,
+
+    STATUS_RSA_OR_IDEA,
+
+    STATUS_TRUST_UNDEFINED,
+    STATUS_TRUST_NEVER,
+    STATUS_TRUST_MARGINAL,
+    STATUS_TRUST_FULLY,
+    STATUS_TRUST_ULTIMATE,
+  
+    STATUS_NEED_PASSPHRASE,
+    STATUS_VALIDSIG,
+    STATUS_SIG_ID,
+    STATUS_ENC_TO,
+    STATUS_NODATA,
+    STATUS_BAD_PASSPHRASE,
+    STATUS_NO_PUBKEY,
+    STATUS_NO_SECKEY,
+    STATUS_NEED_PASSPHRASE_SYM,
+    STATUS_DECRYPTION_FAILED,
+    STATUS_DECRYPTION_OKAY,
+    STATUS_MISSING_PASSPHRASE,
+    STATUS_GOOD_PASSPHRASE,
+    STATUS_GOODMDC,
+    STATUS_BADMDC,
+    STATUS_ERRMDC,
+    STATUS_IMPORTED,
+    STATUS_IMPORT_OK,
+    STATUS_IMPORT_PROBLEM, 
+    STATUS_IMPORT_RES,
+    STATUS_IMPORT_CHECK,
+
+    STATUS_FILE_START,
+    STATUS_FILE_DONE,
+    STATUS_FILE_ERROR,
+  
+    STATUS_BEGIN_DECRYPTION,
+    STATUS_END_DECRYPTION,
+    STATUS_BEGIN_ENCRYPTION,
+    STATUS_END_ENCRYPTION,
+    STATUS_BEGIN_SIGNING,
+  
+    STATUS_DELETE_PROBLEM,
+
+    STATUS_GET_BOOL,
+    STATUS_GET_LINE,
+    STATUS_GET_HIDDEN,
+    STATUS_GOT_IT,
+
+    STATUS_PROGRESS,
+    STATUS_SIG_CREATED,
+    STATUS_SESSION_KEY,
+    STATUS_NOTATION_NAME,
+    STATUS_NOTATION_DATA,
+    STATUS_POLICY_URL,
+    STATUS_BEGIN_STREAM,
+    STATUS_END_STREAM,
+    STATUS_KEY_CREATED,
+    STATUS_USERID_HINT,
+    STATUS_UNEXPECTED,
+    STATUS_INV_RECP,
+    STATUS_NO_RECP,
+
+    STATUS_ALREADY_SIGNED,
+    STATUS_KEYEXPIRED,
+    STATUS_KEYREVOKED,
+    STATUS_SIGEXPIRED,
+    STATUS_EXPSIG,
+    STATUS_EXPKEYSIG,
+
+    STATUS_ATTRIBUTE,
+
+    STATUS_REVKEYSIG,
+
+    STATUS_NEWSIG,
+    STATUS_SIG_SUBPACKET,
+
+    STATUS_PLAINTEXT,
+    STATUS_PLAINTEXT_LENGTH,
+    STATUS_KEY_NOT_CREATED,
+    STATUS_NEED_PASSPHRASE_PIN,
+
+    STATUS_CARDCTRL,
+    STATUS_SC_OP_FAILURE,
+    STATUS_SC_OP_SUCCESS,
+
+    STATUS_BACKUP_KEY_CREATED,
+
+    STATUS_PKA_TRUST_BAD,
+    STATUS_PKA_TRUST_GOOD,
+
+    STATUS_TRUNCATED,
+    STATUS_ERROR
+};
+
+
+const char *get_status_string (int code);
+
+
+#endif /*GNUPG_COMMON_STATUS_H*/
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 714f22da3..7a455df7a 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-15  Werner Koch  <wk@g10code.com>
+
+	* gpg.texi (GPG Configuration): Add PINENTRY_USER_DATA.
+
+	* gpg-agent.texi (Agent Options): Add xauthority.
+
 2007-10-31  Marcus Brinkmann  <marcus@g10code.de>
 
 	* gpg-agent.texi (Agent Options): Fix typos, by Bernhard Reiter.
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index a882aab1d..3acb17ac8 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -94,10 +94,10 @@ required.
 
 Please make sure that a proper pinentry program has been installed
 under the default filename (which is system dependant) or use the
-option @code{pinentry-program} to specify the full name of that
-program.  It is often useful to install a symbolic link from the
-actual used pinentry (e.g. @file{/usr/bin/pinentry-gtk}) to the
-expected one (e.g. @file{/usr/bin/pinentry}).
+option @option{pinentry-program} to specify the full name of that program.
+It is often useful to install a symbolic link from the actual used
+pinentry (e.g. @file{/usr/bin/pinentry-gtk}) to the expected
+one (e.g. @file{/usr/bin/pinentry}).
 
 @manpause
 @noindent
@@ -291,7 +291,7 @@ eval `cut -d= -f 1 < @var{file} | xargs echo export`
 
 @item --no-grab
 @opindex no-grab
-Tell the pinentryo not to grab the keyboard and mouse.  This option
+Tell the pinentry not to grab the keyboard and mouse.  This option
 should in general not be used to avoid X-sniffing attacks.
 
 @item --log-file @var{file}
@@ -422,11 +422,13 @@ default on Windows systems.
 @itemx --ttytype @var{string}
 @itemx --lc-type @var{string}
 @itemx --lc-messages @var{string}
+@itemx --xauthority @var{string}
 @opindex display 
 @opindex ttyname 
 @opindex ttytype 
 @opindex lc-type 
 @opindex lc-messages
+@opindex xauthority
 These options are used with the server mode to pass localization
 information.
 
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 9667417b8..0a1b92ab9 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -2617,6 +2617,10 @@ protocol version which should be set to 1. When starting the gpg-agent
 as described in its documentation, this variable is set to the correct
 value. The option @option{--gpg-agent-info} can be used to override it.
 
+@item PINENTRY_USER_DATA
+This value is passed via gpg-agent to pinentry.  It is useful to convey
+extra information to a custom pinentry
+
 @item COLUMNS
 @itemx LINES
 Used to size some displays to the full size of the screen.
diff --git a/g10/ChangeLog b/g10/ChangeLog
index e4702b041..decbc8ca0 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,27 @@
+2007-11-19  Werner Koch  <wk@g10code.com>
+
+	* keyedit.c (keyedit_menu): String grammar fix.
+
+2007-11-15  Werner Koch  <wk@g10code.com>
+
+	* gpg.c (main): New option --xauthority.
+	* call-agent.c (start_agent): Adjust changed start_new_gpg_agent.
+
+2007-11-12  Werner Koch  <wk@g10code.com>
+
+	* cpr.c (do_get_from_fd): s/bool/getbool/ to overcome problems
+	with Mac OS 10.5 which seems to include stdbool.h silently.
+
+2007-11-07  Werner Koch  <wk@g10code.com>
+
+	Replace all includes of errors.h by status.h (found in common/).
+
+	* status.h: Remove.
+	* status.h: Move prototypes to main.h.
+	* status.c:  Rename to ..
+	* cpr.c: .. this.
+	(get_status_string): Remove.  We take this now from common/.
+
 2007-10-25  David Shaw  <dshaw@jabberwocky.com>  (wk)
 
 	From 1.4 (October):
diff --git a/g10/Makefile.am b/g10/Makefile.am
index 056ff9a97..ff5081200 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -62,8 +62,7 @@ common_source =  \
 	      keyid.c		\
 	      packet.h		\
 	      parse-packet.c	\
-	      status.c		\
-	      status.h		\
+	      cpr.c		\
 	      plaintext.c	\
 	      sig-check.c	\
 	      keylist.c 	\
diff --git a/g10/armor.c b/g10/armor.c
index 76a2bdfbd..2dde9fe05 100644
--- a/g10/armor.c
+++ b/g10/armor.c
@@ -27,7 +27,7 @@
 #include <ctype.h>
 
 #include "gpg.h"
-#include "errors.h"
+#include "status.h"
 #include "iobuf.h"
 #include "util.h"
 #include "filter.h"
diff --git a/g10/build-packet.c b/g10/build-packet.c
index 4c27823cd..88f196a3b 100644
--- a/g10/build-packet.c
+++ b/g10/build-packet.c
@@ -27,7 +27,7 @@
 
 #include "gpg.h"
 #include "packet.h"
-#include "errors.h"
+#include "status.h"
 #include "iobuf.h"
 #include "util.h"
 #include "cipher.h"
diff --git a/g10/call-agent.c b/g10/call-agent.c
index 03c3a74b7..8800f938a 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -82,6 +82,7 @@ start_agent (void)
                               opt.agent_program,
                               opt.display, opt.ttyname, opt.ttytype,
                               opt.lc_ctype, opt.lc_messages,
+                              opt.xauthority, opt.pinentry_user_data,
                               opt.verbose, DBG_ASSUAN,
                               NULL, NULL);
 }
diff --git a/g10/cipher.c b/g10/cipher.c
index fcd3965c3..dc248e395 100644
--- a/g10/cipher.c
+++ b/g10/cipher.c
@@ -26,7 +26,7 @@
 #include <assert.h>
 
 #include "gpg.h"
-#include "errors.h"
+#include "status.h"
 #include "iobuf.h"
 #include "util.h"
 #include "filter.h"
diff --git a/g10/comment.c b/g10/comment.c
index d3dab2a9a..7f9295ea5 100644
--- a/g10/comment.c
+++ b/g10/comment.c
@@ -26,7 +26,7 @@
 
 #include "options.h"
 #include "packet.h"
-#include "errors.h"
+#include "status.h"
 #include "iobuf.h"
 #include "util.h"
 #include "main.h"
diff --git a/g10/status.c b/g10/cpr.c
index e78652482..83f0ccb4d 100644
--- a/g10/status.c
+++ b/g10/cpr.c
@@ -56,102 +56,6 @@ progress_cb (void *ctx, const char *what, int printchar,
   write_status_text (STATUS_PROGRESS, buf);
 }
 
-static const char *
-get_status_string ( int no ) 
-{
-  const char *s;
-
-  switch( no )
-    {
-    case STATUS_ENTER  : s = "ENTER"; break;
-    case STATUS_LEAVE  : s = "LEAVE"; break;
-    case STATUS_ABORT  : s = "ABORT"; break;
-    case STATUS_NEWSIG : s = "NEWSIG"; break;
-    case STATUS_GOODSIG: s = "GOODSIG"; break;
-    case STATUS_KEYEXPIRED: s = "KEYEXPIRED"; break;
-    case STATUS_KEYREVOKED: s = "KEYREVOKED"; break;
-    case STATUS_BADSIG : s = "BADSIG"; break;
-    case STATUS_ERRSIG : s = "ERRSIG"; break;
-    case STATUS_BADARMOR : s = "BADARMOR"; break;
-    case STATUS_RSA_OR_IDEA : s= "RSA_OR_IDEA"; break;
-    case STATUS_TRUST_UNDEFINED: s = "TRUST_UNDEFINED"; break;
-    case STATUS_TRUST_NEVER	 : s = "TRUST_NEVER"; break;
-    case STATUS_TRUST_MARGINAL : s = "TRUST_MARGINAL"; break;
-    case STATUS_TRUST_FULLY	 : s = "TRUST_FULLY"; break;
-    case STATUS_TRUST_ULTIMATE : s = "TRUST_ULTIMATE"; break;
-    case STATUS_GET_BOOL	 : s = "GET_BOOL"; break;
-    case STATUS_GET_LINE	 : s = "GET_LINE"; break;
-    case STATUS_GET_HIDDEN	 : s = "GET_HIDDEN"; break;
-    case STATUS_GOT_IT	 : s = "GOT_IT"; break;
-    case STATUS_SHM_INFO	 : s = "SHM_INFO"; break;
-    case STATUS_SHM_GET	 : s = "SHM_GET"; break;
-    case STATUS_SHM_GET_BOOL	 : s = "SHM_GET_BOOL"; break;
-    case STATUS_SHM_GET_HIDDEN : s = "SHM_GET_HIDDEN"; break;
-    case STATUS_NEED_PASSPHRASE: s = "NEED_PASSPHRASE"; break;
-    case STATUS_VALIDSIG	 : s = "VALIDSIG"; break;
-    case STATUS_SIG_ID	 : s = "SIG_ID"; break;
-    case STATUS_ENC_TO	 : s = "ENC_TO"; break;
-    case STATUS_NODATA	 : s = "NODATA"; break;
-    case STATUS_BAD_PASSPHRASE : s = "BAD_PASSPHRASE"; break;
-    case STATUS_NO_PUBKEY	 : s = "NO_PUBKEY"; break;
-    case STATUS_NO_SECKEY	 : s = "NO_SECKEY"; break;
-    case STATUS_NEED_PASSPHRASE_SYM: s = "NEED_PASSPHRASE_SYM"; break;
-    case STATUS_NEED_PASSPHRASE_PIN: s = "NEED_PASSPHRASE_PIN"; break;
-    case STATUS_DECRYPTION_FAILED: s = "DECRYPTION_FAILED"; break;
-    case STATUS_DECRYPTION_OKAY: s = "DECRYPTION_OKAY"; break;
-    case STATUS_MISSING_PASSPHRASE: s = "MISSING_PASSPHRASE"; break;
-    case STATUS_GOOD_PASSPHRASE : s = "GOOD_PASSPHRASE"; break;
-    case STATUS_GOODMDC	 : s = "GOODMDC"; break;
-    case STATUS_BADMDC	 : s = "BADMDC"; break;
-    case STATUS_ERRMDC	 : s = "ERRMDC"; break;
-    case STATUS_IMPORTED	 : s = "IMPORTED"; break;
-    case STATUS_IMPORT_OK	 : s = "IMPORT_OK"; break;
-    case STATUS_IMPORT_CHECK   : s = "IMPORT_CHECK"; break;
-    case STATUS_IMPORT_RES	 : s = "IMPORT_RES"; break;
-    case STATUS_FILE_START	 : s = "FILE_START"; break;
-    case STATUS_FILE_DONE	 : s = "FILE_DONE"; break;
-    case STATUS_FILE_ERROR	 : s = "FILE_ERROR"; break;
-    case STATUS_BEGIN_DECRYPTION:s = "BEGIN_DECRYPTION"; break;
-    case STATUS_END_DECRYPTION : s = "END_DECRYPTION"; break;
-    case STATUS_BEGIN_ENCRYPTION:s = "BEGIN_ENCRYPTION"; break;
-    case STATUS_END_ENCRYPTION : s = "END_ENCRYPTION"; break;
-    case STATUS_DELETE_PROBLEM : s = "DELETE_PROBLEM"; break;
-    case STATUS_PROGRESS       : s = "PROGRESS"; break;
-    case STATUS_SIG_CREATED    : s = "SIG_CREATED"; break;
-    case STATUS_SESSION_KEY    : s = "SESSION_KEY"; break;
-    case STATUS_NOTATION_NAME  : s = "NOTATION_NAME" ; break;
-    case STATUS_NOTATION_DATA  : s = "NOTATION_DATA" ; break;
-    case STATUS_POLICY_URL     : s = "POLICY_URL" ; break;
-    case STATUS_BEGIN_STREAM   : s = "BEGIN_STREAM"; break;
-    case STATUS_END_STREAM     : s = "END_STREAM"; break;
-    case STATUS_KEY_CREATED    : s = "KEY_CREATED"; break;
-    case STATUS_KEY_NOT_CREATED: s = "KEY_NOT_CREATED"; break;
-    case STATUS_USERID_HINT    : s = "USERID_HINT"; break;
-    case STATUS_UNEXPECTED     : s = "UNEXPECTED"; break;
-    case STATUS_INV_RECP       : s = "INV_RECP"; break;
-    case STATUS_NO_RECP        : s = "NO_RECP"; break;
-    case STATUS_ALREADY_SIGNED : s = "ALREADY_SIGNED"; break;
-    case STATUS_SIGEXPIRED     : s = "SIGEXPIRED deprecated-use-keyexpired-instead"; break;
-    case STATUS_EXPSIG         : s = "EXPSIG"; break;
-    case STATUS_EXPKEYSIG      : s = "EXPKEYSIG"; break;
-    case STATUS_REVKEYSIG      : s = "REVKEYSIG"; break;
-    case STATUS_ATTRIBUTE      : s = "ATTRIBUTE"; break;
-    case STATUS_CARDCTRL       : s = "CARDCTRL"; break;
-    case STATUS_PLAINTEXT      : s = "PLAINTEXT"; break;
-    case STATUS_PLAINTEXT_LENGTH:s = "PLAINTEXT_LENGTH"; break;
-    case STATUS_SIG_SUBPACKET  : s = "SIG_SUBPACKET"; break;
-    case STATUS_SC_OP_SUCCESS  : s = "SC_OP_SUCCESS"; break;
-    case STATUS_SC_OP_FAILURE  : s = "SC_OP_FAILURE"; break;
-    case STATUS_BACKUP_KEY_CREATED:s="BACKUP_KEY_CREATED"; break;
-    case STATUS_PKA_TRUST_BAD  : s = "PKA_TRUST_BAD"; break;
-    case STATUS_PKA_TRUST_GOOD : s = "PKA_TRUST_GOOD"; break;
-    case STATUS_BEGIN_SIGNING  : s = "BEGIN_SIGNING"; break;
-    case STATUS_ERROR          : s = "ERROR"; break;
-    default: s = "?"; break;
-    }
-  return s;
-}
-
 
 /* Return true if the status message NO may currently be issued.  We
    need this to avoid syncronisation problem while auto retrieving a
@@ -383,50 +287,52 @@ myread(int fd, void *buf, size_t count)
 
 
 
-/****************
- * Request a string from the client over the command-fd
- * If bool, returns static string on true (do not free) or NULL for false
- */
+/* Request a string from the client over the command-fd.  If GETBOOL
+   is set the function returns a static string (do not free) if the
+   netered value was true or NULL if the entered value was false.  */
 static char *
-do_get_from_fd( const char *keyword, int hidden, int bool )
+do_get_from_fd ( const char *keyword, int hidden, int getbool )
 {
-    int i, len;
-    char *string;
-
-    if(statusfp!=stdout)
-      fflush(stdout);
-
-    write_status_text( bool? STATUS_GET_BOOL :
-		       hidden? STATUS_GET_HIDDEN : STATUS_GET_LINE, keyword );
-
-    for( string = NULL, i = len = 200; ; i++ ) {
-	if( i >= len-1 ) {
-	    char *save = string;
-	    len += 100;
-	    string = hidden? xmalloc_secure ( len ) : xmalloc ( len );
-	    if( save )
-		memcpy(string, save, i );
-	    else
-		i=0;
+  int i, len;
+  char *string;
+  
+  if (statusfp != stdout)
+    fflush (stdout);
+  
+  write_status_text (getbool? STATUS_GET_BOOL :
+                     hidden? STATUS_GET_HIDDEN : STATUS_GET_LINE, keyword);
+
+  for (string = NULL, i = len = 200; ; i++ ) 
+    {
+      if (i >= len-1 ) 
+        {
+          char *save = string;
+          len += 100;
+          string = hidden? xmalloc_secure ( len ) : xmalloc ( len );
+          if (save)
+            memcpy (string, save, i );
+          else
+            i = 0;
 	}
-	/* Hmmm: why not use our read_line function here */
-	if( myread( opt.command_fd, string+i, 1) != 1 || string[i] == '\n'  )
-            break;
-        else if ( string[i] == CONTROL_D ) {
-            /* found ETX - cancel the line and return a sole ETX */
-            string[0] = CONTROL_D;
-            i=1;
-            break;
+      /* Fixme: why not use our read_line function here? */
+      if ( myread( opt.command_fd, string+i, 1) != 1 || string[i] == '\n'  )
+        break;
+      else if ( string[i] == CONTROL_D ) 
+        {
+          /* Found ETX - Cancel the line and return a sole ETX.  */
+          string[0] = CONTROL_D;
+          i = 1;
+          break;
         }
     }
-    string[i] = 0;
+  string[i] = 0;
 
-    write_status( STATUS_GOT_IT );
+  write_status (STATUS_GOT_IT);
 
-    if( bool )	 /* Fixme: is this correct??? */
-	return (string[0] == 'Y' || string[0] == 'y') ? "" : NULL;
+  if (getbool)	 /* Fixme: is this correct??? */
+    return (string[0] == 'Y' || string[0] == 'y') ? "" : NULL;
 
-    return string;
+  return string;
 }
 
 
diff --git a/g10/dearmor.c b/g10/dearmor.c
index 6f429490f..da888ad14 100644
--- a/g10/dearmor.c
+++ b/g10/dearmor.c
@@ -25,7 +25,7 @@
 #include <assert.h>
 
 #include "gpg.h"
-#include "errors.h"
+#include "status.h"
 #include "iobuf.h"
 #include "util.h"
 #include "filter.h"
diff --git a/g10/decrypt.c b/g10/decrypt.c
index 2c0f25f57..ce400b022 100644
--- a/g10/decrypt.c
+++ b/g10/decrypt.c
@@ -28,7 +28,7 @@
 #include "gpg.h"
 #include "options.h"
 #include "packet.h"
-#include "errors.h"
+#include "status.h"
 #include "iobuf.h"
 #include "keydb.h"
 #include "util.h"
diff --git a/g10/delkey.c b/g10/delkey.c
index 5eb57e5f0..fe29d52ea 100644
--- a/g10/delkey.c
+++ b/g10/delkey.c
@@ -29,7 +29,7 @@
 #include "gpg.h"
 #include "options.h"
 #include "packet.h"
-#include "errors.h"
+#include "status.h"
 #include "iobuf.h"
 #include "keydb.h"
 #include "util.h"
diff --git a/g10/encode.c b/g10/encode.c
index 4a5733220..ee2ce9703 100644
--- a/g10/encode.c
+++ b/g10/encode.c
@@ -28,7 +28,7 @@
 #include "gpg.h"
 #include "options.h"
 #include "packet.h"
-#include "errors.h"
+#include "status.h"
 #include "iobuf.h"
 #include "keydb.h"
 #include "util.h"
diff --git a/g10/export.c b/g10/export.c
index 931f7ce75..09faa0375 100644
--- a/g10/export.c
+++ b/g10/export.c
@@ -28,7 +28,7 @@
 #include "gpg.h"
 #include "options.h"
 #include "packet.h"
-#include "errors.h"
+#include "status.h"
 #include "keydb.h"
 #include "util.h"
 #include "main.h"
diff --git a/g10/gpg.c b/g10/gpg.c
index e1b1efbcd..b548cdf25 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -338,6 +338,7 @@ enum cmd_and_opt_values
     oTTYtype,
     oLCctype,
     oLCmessages,
+    oXauthority,
     oGroup,
     oUnGroup,
     oNoGroups,
@@ -465,7 +466,7 @@ static ARGPARSE_OPTS opts[] = {
     { oMinCertLevel, "min-cert-level", 1, "@"},
     { oAskCertLevel, "ask-cert-level",   0, "@"},
     { oNoAskCertLevel, "no-ask-cert-level",   0, "@"},
-    { oOutput, "output",    2, N_("use as output file")},
+    { oOutput, "output",    2, N_("|FILE|write output to FILE")},
     { oMaxOutput, "max-output", 16|4, "@" },
     { oVerbose, "verbose",   0, N_("verbose") },
     { oQuiet,	"quiet",   0, "@"},
@@ -679,6 +680,7 @@ static ARGPARSE_OPTS opts[] = {
     { oTTYtype,    "ttytype",     2, "@" },
     { oLCctype,    "lc-ctype",    2, "@" },
     { oLCmessages, "lc-messages", 2, "@" },
+    { oXauthority, "xauthority",  2, "@" },
     { oGroup,      "group",       2, "@" },
     { oUnGroup,    "ungroup",     2, "@" },
     { oNoGroups,   "no-groups",    0, "@" },
@@ -2800,6 +2802,7 @@ main (int argc, char **argv )
           case oTTYtype: opt.ttytype = pargs.r.ret_str; break;
           case oLCctype: opt.lc_ctype = pargs.r.ret_str; break;
           case oLCmessages: opt.lc_messages = pargs.r.ret_str; break;
+          case oXauthority: opt.xauthority = pargs.r.ret_str; break;
 	  case oGroup: add_group(pargs.r.ret_str); break;
 	  case oUnGroup: rm_group(pargs.r.ret_str); break;
 	  case oNoGroups:
diff --git a/g10/import.c b/g10/import.c
index fbfb18d0e..a58637c9d 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -28,7 +28,7 @@
 #include "gpg.h"
 #include "options.h"
 #include "packet.h"
-#include "errors.h"
+#include "status.h"
 #include "keydb.h"
 #include "util.h"
 #include "trustdb.h"
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 1078758dd..8efe824ce 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -33,7 +33,7 @@
 #include "gpg.h"
 #include "options.h"
 #include "packet.h"
-#include "errors.h"
+#include "status.h"
 #include "iobuf.h"
 #include "keydb.h"
 #include "photoid.h"
@@ -2095,8 +2095,8 @@ keyedit_menu( const char *username, strlist_t locusr,
 	  case cmdTRUST:
 	    if(opt.trust_model==TM_EXTERNAL)
 	      {
-		tty_printf(_("Owner trust may not be set while "
-			     "using an user provided trust database\n"));
+		tty_printf (_("Owner trust may not be set while "
+			      "using a user provided trust database\n"));
 		break;
 	      }
 
diff --git a/g10/keylist.c b/g10/keylist.c
index adb32e76e..db4ef50f3 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -28,7 +28,7 @@
 #include "gpg.h"
 #include "options.h"
 #include "packet.h"
-#include "errors.h"
+#include "status.h"
 #include "keydb.h"
 #include "photoid.h"
 #include "util.h"
diff --git a/g10/main.h b/g10/main.h
index e782a453f..963387007 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -145,6 +145,30 @@ int pubkey_get_nenc( int algo );
 unsigned int pubkey_nbits( int algo, gcry_mpi_t *pkey );
 int mpi_print( FILE *fp, gcry_mpi_t a, int mode );
 
+/*-- status.c --*/
+void set_status_fd ( int fd );
+int  is_status_enabled ( void );
+void write_status ( int no );
+void write_status_text ( int no, const char *text );
+void write_status_buffer ( int no,
+                           const char *buffer, size_t len, int wrap );
+void write_status_text_and_buffer ( int no, const char *text,
+                                    const char *buffer, size_t len, int wrap );
+
+void write_status_begin_signing (gcry_md_hd_t md);
+
+
+int cpr_enabled(void);
+char *cpr_get( const char *keyword, const char *prompt );
+char *cpr_get_no_help( const char *keyword, const char *prompt );
+char *cpr_get_utf8( const char *keyword, const char *prompt );
+char *cpr_get_hidden( const char *keyword, const char *prompt );
+void cpr_kill_prompt(void);
+int  cpr_get_answer_is_yes( const char *keyword, const char *prompt );
+int  cpr_get_answer_yes_no_quit( const char *keyword, const char *prompt );
+int  cpr_get_answer_okay_cancel (const char *keyword,
+                                 const char *prompt,
+                                 int def_answer);
 
 /*-- helptext.c --*/
 void display_online_help( const char *keyword );
diff --git a/g10/mdfilter.c b/g10/mdfilter.c
index 7a12269e0..a00516456 100644
--- a/g10/mdfilter.c
+++ b/g10/mdfilter.c
@@ -25,7 +25,7 @@
 #include <assert.h>
 
 #include "gpg.h"
-#include "errors.h"
+#include "status.h"
 #include "iobuf.h"
 #include "util.h"
 #include "filter.h"
diff --git a/g10/misc.c b/g10/misc.c
index 96bb6c559..f02601fc4 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -55,7 +55,7 @@
 
 #include "gpg.h"
 #ifdef HAVE_W32_SYSTEM
-# include "errors.h"
+# include "status.h"
 #endif /*HAVE_W32_SYSTEM*/
 #include "util.h"
 #include "main.h"
diff --git a/g10/options.h b/g10/options.h
index be7394e35..fac05b6ed 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -90,6 +90,8 @@ struct
   char *ttytype;
   char *lc_ctype;
   char *lc_messages;
+  char *xauthority;
+  char *pinentry_user_data;
 
   int skip_verify;
   int compress_keys;
diff --git a/g10/pkclist.c b/g10/pkclist.c
index c94c0b297..6b7401826 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -28,7 +28,7 @@
 #include "gpg.h"
 #include "options.h"
 #include "packet.h"
-#include "errors.h"
+#include "status.h"
 #include "keydb.h"
 #include "util.h"
 #include "main.h"
diff --git a/g10/revoke.c b/g10/revoke.c
index 3a532b1d3..cc66dfced 100644
--- a/g10/revoke.c
+++ b/g10/revoke.c
@@ -29,7 +29,7 @@
 #include "gpg.h"
 #include "options.h"
 #include "packet.h"
-#include "errors.h"
+#include "status.h"
 #include "keydb.h"
 #include "util.h"
 #include "main.h"
diff --git a/g10/server.c b/g10/server.c
index 1c17b9f6e..7e783e51e 100644
--- a/g10/server.c
+++ b/g10/server.c
@@ -85,6 +85,12 @@ option_handler (assuan_context_t ctx, const char *key, const char *value)
   else if (!strcmp (key, "lc-messages"))
     {
     }
+  else if (!strcmp (key, "xauthority"))
+    {
+    }
+  else if (!strcmp (key, "pinentry_user_data"))
+    {
+    }
   else if (!strcmp (key, "list-mode"))
     {
       /* This is for now a dummy option. */
diff --git a/g10/sign.c b/g10/sign.c
index 6e3671dbd..6bb30f04b 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -28,7 +28,7 @@
 #include "gpg.h"
 #include "options.h"
 #include "packet.h"
-#include "errors.h"
+#include "status.h"
 #include "iobuf.h"
 #include "keydb.h"
 #include "util.h"
diff --git a/g10/signal.c b/g10/signal.c
index 3a0b438a4..2cabd1990 100644
--- a/g10/signal.c
+++ b/g10/signal.c
@@ -29,7 +29,7 @@
 
 #include "gpg.h"
 #include "options.h"
-#include "errors.h"
+#include "status.h"
 #include "util.h"
 #include "main.h"
 #include "ttyio.h"
diff --git a/g10/skclist.c b/g10/skclist.c
index e0e1256d6..405f3f516 100644
--- a/g10/skclist.c
+++ b/g10/skclist.c
@@ -27,7 +27,7 @@
 #include "gpg.h"
 #include "options.h"
 #include "packet.h"
-#include "errors.h"
+#include "status.h"
 #include "keydb.h"
 #include "util.h"
 #include "i18n.h"
diff --git a/g10/status.h b/g10/status.h
deleted file mode 100644
index 0a2a9e0b6..000000000
--- a/g10/status.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/* status.h
- * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003,
- *               2004 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef G10_STATUS_H
-#define G10_STATUS_H
-
-#define STATUS_ENTER	 1
-#define STATUS_LEAVE	 2
-#define STATUS_ABORT	 3
-
-#define STATUS_GOODSIG	 4
-#define STATUS_BADSIG	 5
-#define STATUS_ERRSIG	 6
-
-#define STATUS_BADARMOR  7
-
-#define STATUS_RSA_OR_IDEA 8
-#define STATUS_KEYEXPIRED  9
-#define STATUS_KEYREVOKED  10
-
-#define STATUS_TRUST_UNDEFINED 11
-#define STATUS_TRUST_NEVER     12
-#define STATUS_TRUST_MARGINAL  13
-#define STATUS_TRUST_FULLY     14
-#define STATUS_TRUST_ULTIMATE  15
-
-#define STATUS_SHM_INFO        16
-#define STATUS_SHM_GET	       17
-#define STATUS_SHM_GET_BOOL    18
-#define STATUS_SHM_GET_HIDDEN  19
-
-#define STATUS_NEED_PASSPHRASE 20
-#define STATUS_VALIDSIG        21
-#define STATUS_SIG_ID	       22
-#define STATUS_ENC_TO	       23
-#define STATUS_NODATA	       24
-#define STATUS_BAD_PASSPHRASE  25
-#define STATUS_NO_PUBKEY       26
-#define STATUS_NO_SECKEY       27
-#define STATUS_NEED_PASSPHRASE_SYM 28
-#define STATUS_DECRYPTION_FAILED 29
-#define STATUS_DECRYPTION_OKAY	 30
-#define STATUS_MISSING_PASSPHRASE 31
-#define STATUS_GOOD_PASSPHRASE	32
-#define STATUS_GOODMDC		33
-#define STATUS_BADMDC		34
-#define STATUS_ERRMDC		35
-#define STATUS_IMPORTED 	36
-#define STATUS_IMPORT_RES	37
-#define STATUS_FILE_START	38
-#define STATUS_FILE_DONE	39
-#define STATUS_FILE_ERROR	40
-
-#define STATUS_BEGIN_DECRYPTION 41
-#define STATUS_END_DECRYPTION	42
-#define STATUS_BEGIN_ENCRYPTION 43
-#define STATUS_END_ENCRYPTION	44
-
-#define STATUS_DELETE_PROBLEM	45
-#define STATUS_GET_BOOL 	46
-#define STATUS_GET_LINE 	47
-#define STATUS_GET_HIDDEN	48
-#define STATUS_GOT_IT		49
-#define STATUS_PROGRESS 	50
-#define STATUS_SIG_CREATED	51
-#define STATUS_SESSION_KEY	52
-#define STATUS_NOTATION_NAME    53
-#define STATUS_NOTATION_DATA    54
-#define STATUS_POLICY_URL       55
-#define STATUS_BEGIN_STREAM     56
-#define STATUS_END_STREAM       57
-#define STATUS_KEY_CREATED      58
-#define STATUS_USERID_HINT      59
-#define STATUS_UNEXPECTED       60
-#define STATUS_INV_RECP         61
-#define STATUS_NO_RECP          62
-#define STATUS_ALREADY_SIGNED   63
-#define STATUS_SIGEXPIRED       64
-#define STATUS_EXPSIG           65
-#define STATUS_EXPKEYSIG        66
-#define STATUS_ATTRIBUTE        67
-#define STATUS_IMPORT_OK 	68
-#define STATUS_IMPORT_CHECK     69
-#define STATUS_REVKEYSIG        70
-#define STATUS_CARDCTRL         71
-#define STATUS_NEWSIG           72
-#define STATUS_PLAINTEXT        73
-#define STATUS_PLAINTEXT_LENGTH 74
-#define STATUS_KEY_NOT_CREATED  75
-#define STATUS_NEED_PASSPHRASE_PIN 76
-#define STATUS_SIG_SUBPACKET    77
-
-/* Extra status codes for certain smartcard operations.  Primary
-   useful to double check that change PIN worked as expected.  */
-#define STATUS_SC_OP_FAILURE    79
-#define STATUS_SC_OP_SUCCESS    80
-
-#define STATUS_BACKUP_KEY_CREATED 81
-
-#define STATUS_PKA_TRUST_BAD    82
-#define STATUS_PKA_TRUST_GOOD   83
-
-#define STATUS_BEGIN_SIGNING    84
-
-#define STATUS_ERROR  85
-
-
-/*-- status.c --*/
-void set_status_fd ( int fd );
-int  is_status_enabled ( void );
-void write_status ( int no );
-void write_status_text ( int no, const char *text );
-void write_status_buffer ( int no,
-                           const char *buffer, size_t len, int wrap );
-void write_status_text_and_buffer ( int no, const char *text,
-                                    const char *buffer, size_t len, int wrap );
-
-void write_status_begin_signing (gcry_md_hd_t md);
-
-
-int cpr_enabled(void);
-char *cpr_get( const char *keyword, const char *prompt );
-char *cpr_get_no_help( const char *keyword, const char *prompt );
-char *cpr_get_utf8( const char *keyword, const char *prompt );
-char *cpr_get_hidden( const char *keyword, const char *prompt );
-void cpr_kill_prompt(void);
-int  cpr_get_answer_is_yes( const char *keyword, const char *prompt );
-int  cpr_get_answer_yes_no_quit( const char *keyword, const char *prompt );
-int  cpr_get_answer_okay_cancel (const char *keyword,
-                                 const char *prompt,
-                                 int def_answer);
-
-#endif /*G10_STATUS_H*/
diff --git a/g10/tdbdump.c b/g10/tdbdump.c
index 2d69d9fbd..5e7b685e2 100644
--- a/g10/tdbdump.c
+++ b/g10/tdbdump.c
@@ -30,7 +30,7 @@
 #include <unistd.h>
 
 #include "gpg.h"
-#include "errors.h"
+#include "status.h"
 #include "iobuf.h"
 #include "keydb.h"
 #include "util.h"
diff --git a/g10/tdbio.c b/g10/tdbio.c
index 563178f61..d763d2a92 100644
--- a/g10/tdbio.c
+++ b/g10/tdbio.c
@@ -29,7 +29,7 @@
 #include <unistd.h>
 
 #include "gpg.h"
-#include "errors.h"
+#include "status.h"
 #include "iobuf.h"
 #include "util.h"
 #include "options.h"
diff --git a/g10/textfilter.c b/g10/textfilter.c
index 34b12790f..14bf69962 100644
--- a/g10/textfilter.c
+++ b/g10/textfilter.c
@@ -25,7 +25,7 @@
 #include <assert.h>
 
 #include "gpg.h"
-#include "errors.h"
+#include "status.h"
 #include "iobuf.h"
 #include "util.h"
 #include "filter.h"
diff --git a/g10/trustdb.c b/g10/trustdb.c
index c5caf2843..62eafba0d 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -30,7 +30,7 @@
 #endif /* !DISABLE_REGEX */
 
 #include "gpg.h"
-#include "errors.h"
+#include "status.h"
 #include "iobuf.h"
 #include "keydb.h"
 #include "util.h"
diff --git a/g10/verify.c b/g10/verify.c
index edaefcd0d..702547ea2 100644
--- a/g10/verify.c
+++ b/g10/verify.c
@@ -28,7 +28,7 @@
 #include "gpg.h"
 #include "options.h"
 #include "packet.h"
-#include "errors.h"
+#include "status.h"
 #include "iobuf.h"
 #include "keydb.h"
 #include "util.h"
diff --git a/jnlib/ChangeLog b/jnlib/ChangeLog
index 452a99b3f..0dc15daae 100644
--- a/jnlib/ChangeLog
+++ b/jnlib/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-19  Werner Koch  <wk@g10code.com>
+
+	* stringhelp.c (percent_escape): Factor code out to
+	(do_percent_escape): .. new.
+	(try_percent_escape): New.
+
 2007-10-01  Werner Koch  <wk@g10code.com>
 
 	* w32-afunix.c: Only keep the client related code.
diff --git a/jnlib/stringhelp.c b/jnlib/stringhelp.c
index 2f5204341..028750528 100644
--- a/jnlib/stringhelp.c
+++ b/jnlib/stringhelp.c
@@ -856,9 +856,9 @@ memrchr (const void *buffer, int c, size_t n)
 
 
 /* Percent-escape the string STR by replacing colons with '%3a'.  If
-   EXTRA is not NULL all characters in it are also escaped. */
-char *
-percent_escape (const char *str, const char *extra)
+   EXTRA is not NULL all characters in EXTRA are also escaped.  */
+static char *
+do_percent_escape (const char *str, const char *extra, int die)
 {
   int i, j;
   char *ptr;
@@ -869,7 +869,14 @@ percent_escape (const char *str, const char *extra)
   for (i=j=0; str[i]; i++)
     if (str[i] == ':' || str[i] == '%' || (extra && strchr (extra, str[i])))
       j++;
-  ptr = jnlib_xmalloc (i + 2 * j + 1);
+  if (die)
+    ptr = jnlib_xmalloc (i + 2 * j + 1);
+  else
+    {
+      ptr = jnlib_malloc (i + 2 * j + 1);
+      if (!ptr)
+        return NULL;
+    }
   i = 0;
   while (*str)
     {
@@ -899,3 +906,19 @@ percent_escape (const char *str, const char *extra)
 
   return ptr;
 }
+
+/* Percent-escape the string STR by replacing colons with '%3a'.  If
+   EXTRA is not NULL all characters in EXTRA are also escaped.  */
+char *
+percent_escape (const char *str, const char *extra)
+{
+  return do_percent_escape (str, extra, 1);
+}
+
+/* Same as percent_escape but return NULL instead of exiting on memory
+   error. */
+char *
+try_percent_escape (const char *str, const char *extra)
+{
+  return do_percent_escape (str, extra, 0);
+}
diff --git a/jnlib/stringhelp.h b/jnlib/stringhelp.h
index 6dee2e417..cb7051933 100644
--- a/jnlib/stringhelp.h
+++ b/jnlib/stringhelp.h
@@ -116,8 +116,11 @@ isascii (int c)
 #define STR2(v) STR(v)
 
 /* Percent-escape the string STR by replacing colons with '%3a'.  If
-   EXTRA is not NULL, also replace all characters given in EXTRA. */
+   EXTRA is not NULL, also replace all characters given in EXTRA.  The
+   "try_" variant fails with NULL if not enough memory can be
+   allocated.  */
 char *percent_escape (const char *str, const char *extra);
+char *try_percent_escape (const char *str, const char *extra);
 
 
 #endif /*LIBJNLIB_STRINGHELP_H*/
diff --git a/po/ChangeLog b/po/ChangeLog
index 50ade673d..43b0ea91f 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,6 +1,14 @@
+2007-11-15  Werner Koch  <wk@g10code.com>
+
+	* de.po: Type fix.
+
+2007-11-12  Daniel Nylander <po@danielnylander.se>  (wk)
+
+	* sv.po: Updated.
+
 2007-09-14  Werner Koch  <wk@g10code.com>
 
-	* de.po: Chnaged translation of --honor-http-proxy.
+	* de.po: Changed translation of --honor-http-proxy.
 
 2007-08-29  Werner Koch  <wk@g10code.com>
 
diff --git a/po/be.po b/po/be.po
index 13a61e916..97b185bfa 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-09-14 13:27+0200\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
 "PO-Revision-Date: 2003-10-30 16:35+0200\n"
 "Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -15,57 +15,73 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: agent/call-pinentry.c:438
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:441
+#: agent/call-pinentry.c:551
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 
-#: agent/call-pinentry.c:489
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+msgid "Quality:"
+msgstr ""
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 #, fuzzy
 msgid "PIN too long"
 msgstr "пароль занадта доўгі\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:668
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "пароль занадта доўгі\n"
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:676
 msgid "Invalid characters in PIN"
 msgstr ""
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:535
+#: agent/call-pinentry.c:693
 #, fuzzy
 msgid "Bad PIN"
 msgstr "дрэнны MPI"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:694
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "дрэнны пароль"
 
-#: agent/call-pinentry.c:572
+#: agent/call-pinentry.c:730
 #, fuzzy
 msgid "Passphrase"
 msgstr "дрэнны пароль"
@@ -75,21 +91,21 @@ msgstr "дрэнны пароль"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr ""
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
-#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1865
-#: sm/gpgsm.c:1902 sm/gpgsm.c:1940 sm/qualified.c:72
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr ""
@@ -131,14 +147,25 @@ msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: agent/command-ssh.c:2349
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "Увядзіце пароль\n"
+
+#: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2850
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/command-ssh.c:2885
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
@@ -181,76 +208,66 @@ msgstr "Увядзіце пароль\n"
 msgid "Take this one anyway"
 msgstr ""
 
-#: agent/genkey.c:185
+#: agent/genkey.c:191
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u character long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u characters long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:202
+#: agent/genkey.c:212
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digit or special character."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digits or special characters."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:225
+#: agent/genkey.c:235
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
-"passphrase may not%0Abe a known term or match certain pattern."
+"Warning: You have entered an insecure passphrase.%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:238
+#: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:240
+#: agent/genkey.c:253
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:246
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:290
+#: agent/genkey.c:306
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "Увядзіце пароль\n"
-
-#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
-#: tools/symcryptrun.c:456
-msgid "does not match - try again"
-msgstr ""
-
-#: agent/genkey.c:412
+#: agent/genkey.c:429
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "Паўтарыце пароль\n"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:104
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -260,64 +277,63 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:109
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:69 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "шматслоўнасьць"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:341
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "працаваць менш шматслоўна"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:112
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:113
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
-#: tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:134
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "do not use the SCdaemon"
 msgstr ""
 
@@ -354,148 +370,163 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:91 tools/symcryptrun.c:204
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Калі ласка, паведамляйце пра памылкі на <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:512 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:340 sm/gpgsm.c:819 sm/gpgsm.c:822 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:610 agent/gpg-agent.c:1177 g10/gpg.c:2027
-#: scd/scdaemon.c:421 sm/gpgsm.c:914 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:947 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1247 agent/gpg-agent.c:1373 agent/gpg-agent.c:1377
-#: agent/gpg-agent.c:1418 agent/gpg-agent.c:1422 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:908
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
+#: agent/gpg-agent.c:1321
+#, c-format
+msgid "socket name `%s' is too long\n"
+msgstr ""
+
+#: agent/gpg-agent.c:1333
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
+#, fuzzy
+msgid "error getting nonce for the socket\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: тэчка створана\n"
 
-#: agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1448
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: agent/gpg-agent.c:1438
+#: agent/gpg-agent.c:1452
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1549
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
+#, fuzzy, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1554
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1571
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1576
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, c-format
 msgid "%s %s stopped\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1809
+#: agent/gpg-agent.c:1850
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:756
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
-#: tools/gpg-connect-agent.c:767
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr ""
@@ -522,37 +553,37 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1188
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1191
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1216
+#: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1221
+#: agent/protect-tool.c:1199
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "дрэнны пароль"
 
-#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr ""
 
-#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "скасавана карыстальнікам\n"
@@ -664,7 +695,8 @@ msgstr "дрэнны пароль"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1338
+#: tools/gpgconf-comp.c:1641
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
@@ -811,76 +843,80 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:366
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr ""
 
-#: g10/armor.c:405
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr ""
 
-#: g10/armor.c:416
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr ""
 
-#: g10/armor.c:427
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr ""
 
-#: g10/armor.c:479
+#: g10/armor.c:455
+msgid "unknown armor header: "
+msgstr ""
+
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr ""
 
-#: g10/armor.c:614
+#: g10/armor.c:643
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "нечаканыя даньні"
 
-#: g10/armor.c:626
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr ""
 
-#: g10/armor.c:780 g10/armor.c:1390
+#: g10/armor.c:809 g10/armor.c:1419
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr ""
 
-#: g10/armor.c:823
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr ""
 
-#: g10/armor.c:857
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr ""
 
-#: g10/armor.c:865
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr ""
 
-#: g10/armor.c:869 g10/armor.c:1427
+#: g10/armor.c:898 g10/armor.c:1456
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "памылка CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:889
+#: g10/armor.c:918
 msgid "premature eof (in trailer)\n"
 msgstr ""
 
-#: g10/armor.c:893
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr ""
 
-#: g10/armor.c:1204
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr ""
 
-#: g10/armor.c:1209
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr ""
 
-#: g10/armor.c:1213
+#: g10/armor.c:1242
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1212,11 +1248,11 @@ msgstr "сакрэтны ключ недаступны"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 
-#: g10/decrypt.c:110 g10/encode.c:890
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
@@ -1227,7 +1263,7 @@ msgstr "немагчыма адкрыць \"%s\"\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1268,7 +1304,7 @@ msgstr ""
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:226 g10/sign.c:1296
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr ""
@@ -1287,7 +1323,7 @@ msgstr "збой падпісаньня: %s\n"
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr ""
@@ -1312,24 +1348,24 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:669 g10/sign.c:966
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr ""
 
-#: g10/encode.c:765
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 
-#: g10/encode.c:862
+#: g10/encode.c:848
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr ""
@@ -1507,7 +1543,7 @@ msgstr "%s: немагчыма стварыць тэчку: %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1515,133 +1551,133 @@ msgstr ""
 "@Загады:\n"
 " "
 
-#: g10/gpg.c:370
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[файл]|зрабіць подпіс"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
 
-#: g10/gpg.c:372 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "зрабіць адчэплены подпіс"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "зашыфраваць даньні"
 
-#: g10/gpg.c:375 sm/gpgsm.c:248
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr "шыфраваньне толькі сымэтрычнымі шыфрамі"
 
-#: g10/gpg.c:377 sm/gpgsm.c:249
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "разшыфраваць даньні (дапомна)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "праверыць подпіс"
 
-#: g10/gpg.c:381 sm/gpgsm.c:252
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "паказаць сьпіс ключоў"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/gpg.c:386 sm/gpgsm.c:254
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "remove keys from the public keyring"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "remove keys from the secret keyring"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "падпісаць ключ"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "падпісаць ці рэдагаваць ключ"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr ""
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "экспарт ключоў"
 
-#: g10/gpg.c:397 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:402
 msgid "search for keys on a key server"
 msgstr ""
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "update all keys from a keyserver"
 msgstr "абнавіць усе ключы з паслужніка ключоў"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "імпартаваць/аб'яднаць ключы"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:410
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr ""
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr ""
 
-#: g10/gpg.c:430 sm/gpgsm.c:264
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1651,47 +1687,47 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:281
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr ""
 
-#: g10/gpg.c:436 sm/gpgsm.c:293
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 
-#: g10/gpg.c:447 sm/gpgsm.c:331
+#: g10/gpg.c:449 sm/gpgsm.c:333
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 
-#: g10/gpg.c:448 sm/gpgsm.c:334
+#: g10/gpg.c:450 sm/gpgsm.c:336
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 
-#: g10/gpg.c:453 sm/gpgsm.c:336
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr ""
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
-msgid "use as output file"
-msgstr "выкарыстоўваць у якасьці файла вываду"
+#: g10/gpg.c:469 sm/gpgsm.c:341
+msgid "|FILE|write output to FILE"
+msgstr ""
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "не рабіць ніякіх зьменаў"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "пытацца перад перазапісам"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:524
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:397
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1699,7 +1735,7 @@ msgstr ""
 "@\n"
 "(Глядзіце man старонку, для больш поўнага апісаньня ўсіх загадаў і выбараў)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:400
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1719,15 +1755,15 @@ msgstr ""
 " --list-keys [назвы]        паказаць ключы\n"
 " --fingerprint [назвы]      паказаць адбіткі пальцаў\n"
 
-#: g10/gpg.c:750 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Калі ласка, паведамляйце пра памылкі на <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:767
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1737,7 +1773,7 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:578
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1745,547 +1781,551 @@ msgstr ""
 "\n"
 "Альгарытмы, якія падтрымліваюцца:\n"
 
-#: g10/gpg.c:784
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:791 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:798
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:805 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr ""
 
-#: g10/gpg.c:875
+#: g10/gpg.c:817 sm/gpgsm.c:603
+msgid "Used libraries:"
+msgstr ""
+
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:715
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/gpg.c:1063
+#: g10/gpg.c:1113
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1260
+#: g10/gpg.c:1310
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1263
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1266
+#: g10/gpg.c:1316
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1272
+#: g10/gpg.c:1322
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1325
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1328
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1284
+#: g10/gpg.c:1334
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1337
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1340
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1296
+#: g10/gpg.c:1346
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1349
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1352
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1445
+#: g10/gpg.c:1495
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1594
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1602
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1610
 msgid "show the keyring name in key listings"
 msgstr ""
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1612
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1825
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1981
+#: g10/gpg.c:2030
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 
-#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2493
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/gpg.c:2528
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2610
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2613
 msgid "invalid import options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2620
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2551
+#: g10/gpg.c:2623
 msgid "invalid export options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2630
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2561
+#: g10/gpg.c:2633
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2645
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2653
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2655
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2659
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2670
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2673
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2855
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1298
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2975
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "запіс у stdout\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:3014
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1370
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1378
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3092
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3098
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3117
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3119
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3121
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3135
 msgid "invalid default preferences\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3144
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3148
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3152
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3185
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3232
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3237
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3242
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [назва_файла]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва_файла]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3375
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва_файла]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--sign [назва_файла]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3449
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3454
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3474
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва_файла]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва_файла]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва_файла]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [загады]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3626
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3628
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3630
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3641
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3651
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[назва_файла]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4233
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4235
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4268
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
 
@@ -2298,7 +2338,7 @@ msgstr "выдаліць ключы са зьвязку грамадскіх к�
 msgid "make timestamp conflicts only a warning"
 msgstr ""
 
-#: g10/gpgv.c:75 sm/gpgsm.c:372
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr ""
 
@@ -2733,13 +2773,13 @@ msgstr ""
 msgid "no writable keyring found: %s\n"
 msgstr ""
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr ""
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2369 g10/import.c:2391
+#: g10/import.c:2381 g10/import.c:2403
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr ""
@@ -2829,7 +2869,7 @@ msgstr ""
 msgid "importing secret keys not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/import.c:1158 g10/import.c:2384
+#: g10/import.c:1158 g10/import.c:2396
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr ""
@@ -2949,40 +2989,40 @@ msgstr ""
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 
-#: g10/import.c:1732
+#: g10/import.c:1744
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1794
+#: g10/import.c:1806
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 
-#: g10/import.c:1808
+#: g10/import.c:1820
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 
-#: g10/import.c:1867
+#: g10/import.c:1879
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr ""
 
-#: g10/import.c:1901
+#: g10/import.c:1913
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%s: тэчка створана\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2302
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2298
+#: g10/import.c:2310
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr ""
 
-#: g10/import.c:2300
+#: g10/import.c:2312
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr ""
 
@@ -3264,7 +3304,7 @@ msgid "Really sign? (y/N) "
 msgstr ""
 
 #: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:348
+#: g10/keyedit.c:5019 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
@@ -3605,8 +3645,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
 #: g10/keyedit.c:2140
@@ -4423,13 +4462,13 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:273
+#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:275
+#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5023,17 +5062,17 @@ msgstr ""
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:874
+#: g10/misc.c:891
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1049
+#: g10/misc.c:1066
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr ""
 
-#: g10/misc.c:1074
+#: g10/misc.c:1091
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "невядомая вэрсыя"
@@ -5090,12 +5129,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:313 g10/passphrase.c:603
+#: g10/passphrase.c:295 g10/passphrase.c:581
 #, c-format
 msgid " (main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:327
+#: g10/passphrase.c:309
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5106,24 +5145,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-бітавы %s ключ, ID %08lX, створаны %s%s\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:334
 msgid "Repeat passphrase\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:336
 msgid "Enter passphrase\n"
 msgstr "Увядзіце пароль\n"
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:363
 msgid "cancelled by user\n"
 msgstr "скасавана карыстальнікам\n"
 
-#: g10/passphrase.c:384 g10/passphrase.c:450
+#: g10/passphrase.c:369 g10/passphrase.c:428
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/passphrase.c:582
+#: g10/passphrase.c:560
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5133,12 +5172,12 @@ msgstr ""
 "Вам неабходна ўвесьці пароль, каб адчыніць сакрэтны ключ для\n"
 "карыстальніка: \""
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:568
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
 
-#: g10/passphrase.c:599
+#: g10/passphrase.c:577
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5728,69 +5767,53 @@ msgstr ""
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 
-#: g10/sign.c:82
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:90
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-
-#: g10/sign.c:104
+#: g10/sign.c:89
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:121
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:129
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:142
+#: g10/sign.c:115
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:170
+#: g10/sign.c:138
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:343
+#: g10/sign.c:311
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr ""
 
-#: g10/sign.c:352
+#: g10/sign.c:320
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:864
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:991
+#: g10/sign.c:961
 msgid "signing:"
 msgstr ""
 
-#: g10/sign.c:1106
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1290
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
@@ -6488,62 +6511,62 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:114 sm/gpgsm.c:361
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 msgid "read options from file"
 msgstr ""
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:126
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:135
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "несумяшчальныя загады\n"
 
-#: scd/scdaemon.c:209
+#: scd/scdaemon.c:210
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: scd/scdaemon.c:211
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:658
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1006
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1011
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6576,11 +6599,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1631
+#: sm/certchain.c:195 sm/certchain.c:1646
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1631
+#: sm/certchain.c:196 sm/certchain.c:1646
 #, fuzzy
 msgid "shell"
 msgstr "даведка (help)"
@@ -6621,8 +6644,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
@@ -6788,7 +6811,7 @@ msgstr ""
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1730
+#: sm/certchain.c:1462 sm/certchain.c:1745
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "грамадскі ключ ня знойдзены"
@@ -6803,11 +6826,11 @@ msgstr "дрэнны сэртыфікат"
 msgid "root certificate is good\n"
 msgstr "дрэнны сэртыфікат"
 
-#: sm/certchain.c:1620
+#: sm/certchain.c:1635
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1629
+#: sm/certchain.c:1644
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -6822,7 +6845,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6836,25 +6859,25 @@ msgstr "no [не]"
 msgid "[none]"
 msgstr "невядомая вэрсыя"
 
-#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
+#: sm/certdump.c:583 sm/certdump.c:628 sm/certdump.c:693 sm/certdump.c:746
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: sm/certdump.c:558 sm/certdump.c:603
+#: sm/certdump.c:591 sm/certdump.c:636
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:640 sm/certdump.c:696
+#: sm/certdump.c:673 sm/certdump.c:729
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:665 sm/certdump.c:719
+#: sm/certdump.c:698 sm/certdump.c:752
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: sm/certdump.c:936
+#: sm/certdump.c:946
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -6980,186 +7003,194 @@ msgstr "збой падпісаньня: %s\n"
 msgid "no valid recipients given\n"
 msgstr ""
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[файл]|зрабіць подпіс"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list external keys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
 #, fuzzy
 msgid "list certificate chain"
 msgstr "дрэнны сэртыфікат"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "import certificates"
 msgstr "дрэнны сэртыфікат"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "export certificates"
 msgstr "дрэнны сэртыфікат"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:270
 #, fuzzy
 msgid "change a passphrase"
 msgstr "дрэнны пароль"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
 msgid "create base-64 encoded output"
 msgstr ""
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 #, fuzzy
 msgid "|NAME|use NAME as default recipient"
 msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "use the default key as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:345
+msgid "|FILE|write a server mode log to FILE"
+msgstr ""
+
+#: sm/gpgsm.c:347
+msgid "|FILE|write an audit log to FILE"
+msgstr ""
+
+#: sm/gpgsm.c:349
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "праверыць подпісы ключа"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr "заўсёдвы выкарыстоўваць MDC для шыфраваньня"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:359
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:360
 msgid "add this secret keyring to the list"
 msgstr ""
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ВУЗЕЛ|     выкарыстоўваць гэты паслужнік для пошуку ключоў"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:363
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|НАЗВА|     усталяваць мноства знакаў тэрмінала"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:379
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:388
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:390
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:392
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: sm/gpgsm.c:568
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: sm/gpgsm.c:571
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7170,36 +7201,36 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: sm/gpgsm.c:650
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: sm/gpgsm.c:748
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: sm/gpgsm.c:759
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: sm/gpgsm.c:1315
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1411
+#: sm/gpgsm.c:1468
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1429
+#: sm/gpgsm.c:1486
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: sm/gpgsm.c:1612
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7221,7 +7252,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:1274
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
@@ -7284,17 +7315,17 @@ msgstr "памылка стварэньня \"%s\": %s\n"
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:111
+#: sm/qualified.c:105
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: sm/qualified.c:129
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:225
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7305,13 +7336,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234 sm/verify.c:536
+#: sm/qualified.c:209 sm/verify.c:580
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:327
+#: sm/qualified.c:277
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7324,290 +7355,307 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr ""
 
-#: sm/verify.c:388
+#: sm/verify.c:424
 #, fuzzy
 msgid "Signature made "
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:428
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:429
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: sm/verify.c:514
+#: sm/verify.c:558
 #, fuzzy
 msgid "Good signature from"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: sm/verify.c:515
+#: sm/verify.c:559
 msgid "                aka"
 msgstr ""
 
-#: sm/verify.c:533
+#: sm/verify.c:577
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "quit [выйсьці]"
 
-#: tools/gpg-connect-agent.c:60
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:127
+#: tools/gpg-connect-agent.c:74
+msgid "|FILE|run commands from FILE on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:75
+msgid "run /subst on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:174
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: tools/gpg-connect-agent.c:130
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:314
+#: tools/gpg-connect-agent.c:1155
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:323
+#: tools/gpg-connect-agent.c:1164
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:381
+#: tools/gpg-connect-agent.c:1219 tools/gpg-connect-agent.c:1645
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "грамадскі ключ ня знойдзены"
+
+#: tools/gpg-connect-agent.c:1299
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "пароль занадта доўгі\n"
 
-#: tools/gpg-connect-agent.c:385
+#: tools/gpg-connect-agent.c:1303
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:1619
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:1637
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: tools/gpg-connect-agent.c:473
-#, fuzzy, c-format
-msgid "receiving line failed: %s\n"
-msgstr "грамадскі ключ ня знойдзены"
-
-#: tools/gpg-connect-agent.c:789
+#: tools/gpg-connect-agent.c:1986
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: tools/gpg-connect-agent.c:798
+#: tools/gpg-connect-agent.c:1995
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
-#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
+#: tools/gpgconf-comp.c:459 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:773
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:796
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
-#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
+#: tools/gpgconf-comp.c:482 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:803
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
-#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:487 tools/gpgconf-comp.c:606 tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:729 tools/gpgconf-comp.c:811
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:737
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:504
+#: tools/gpgconf-comp.c:502
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:506
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:512
+#: tools/gpgconf-comp.c:510
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:526
+#: tools/gpgconf-comp.c:524
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:527
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:531
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:535
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:539
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:543
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:547
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "Паўтарыце пароль\n"
 
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:710
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:669
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:671
 msgid "|URL|use keyserver at URL"
 msgstr ""
 
-#: tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:674
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:719
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:744
+#: tools/gpgconf-comp.c:742
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:786
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:824
+#: tools/gpgconf-comp.c:822
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:834
+#: tools/gpgconf-comp.c:832
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:845
+#: tools/gpgconf-comp.c:843
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:850
+#: tools/gpgconf-comp.c:848
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:887
+#: tools/gpgconf-comp.c:885
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2982
+#: tools/gpgconf-comp.c:3006
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:59
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
+#, fuzzy
+msgid "list global configuration file"
+msgstr "невядомая вэрсыя"
+
+#: tools/gpgconf.c:67
 #, fuzzy
 msgid "check global configuration file"
 msgstr "невядомая вэрсыя"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:71
+msgid "use as output file"
+msgstr "выкарыстоўваць у якасьці файла вываду"
+
+#: tools/gpgconf.c:75
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:100
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:176 tools/gpgconf.c:209
+#: tools/gpgconf.c:202 tools/gpgconf.c:240
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: tools/gpgconf.c:178
+#: tools/gpgconf.c:204
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:187
+#: tools/gpgconf.c:213
 #, fuzzy
 msgid "Component not found"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:242
 #, fuzzy
 msgid "No argument allowed"
 msgstr "сакрэтны ключ недаступны"
@@ -7700,87 +7748,87 @@ msgstr "памылка стварэньня \"%s\": %s\n"
 msgid "error closing %s: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: tools/symcryptrun.c:515
+#: tools/symcryptrun.c:486
 msgid "no --program option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:521
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:556
+#: tools/symcryptrun.c:527
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: tools/symcryptrun.c:563
+#: tools/symcryptrun.c:534
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: tools/symcryptrun.c:579
+#: tools/symcryptrun.c:550
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:578
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: tools/symcryptrun.c:636
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: tools/symcryptrun.c:653
+#: tools/symcryptrun.c:624
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: tools/symcryptrun.c:705
+#: tools/symcryptrun.c:676
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: tools/symcryptrun.c:757
+#: tools/symcryptrun.c:728
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: tools/symcryptrun.c:771
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:826
+#: tools/symcryptrun.c:797
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: tools/symcryptrun.c:839
+#: tools/symcryptrun.c:810
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: tools/symcryptrun.c:1014
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1041
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1050
+#: tools/symcryptrun.c:1021
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "непадтрымліваецца"
diff --git a/po/ca.po b/po/ca.po
index 2636d4c4a..d40fadc70 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-09-14 13:27+0200\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -35,59 +35,75 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 
-#: agent/call-pinentry.c:438
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:441
+#: agent/call-pinentry.c:551
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/call-pinentry.c:489
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+msgid "Quality:"
+msgstr ""
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 #, fuzzy
 msgid "PIN too long"
 msgstr "la línia és massa llarga\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:668
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "la contrasenya és massa llarga\n"
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:676
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:535
+#: agent/call-pinentry.c:693
 #, fuzzy
 msgid "Bad PIN"
 msgstr "l'MPI és erroni"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:694
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "la contrasenya és errònia"
 
-#: agent/call-pinentry.c:572
+#: agent/call-pinentry.c:730
 #, fuzzy
 msgid "Passphrase"
 msgstr "la contrasenya és errònia"
@@ -97,21 +113,21 @@ msgstr "la contrasenya és errònia"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
-#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1865
-#: sm/gpgsm.c:1902 sm/gpgsm.c:1940 sm/qualified.c:72
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
@@ -153,14 +169,25 @@ msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/command-ssh.c:2349
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "canvia la contrasenya"
+
+#: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2850
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/command-ssh.c:2885
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
@@ -206,76 +233,66 @@ msgstr "Introduïu la contrasenya\n"
 msgid "Take this one anyway"
 msgstr "Voleu usar de tota manera aquesta clau?"
 
-#: agent/genkey.c:185
+#: agent/genkey.c:191
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u character long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u characters long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:202
+#: agent/genkey.c:212
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digit or special character."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digits or special characters."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:225
+#: agent/genkey.c:235
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
-"passphrase may not%0Abe a known term or match certain pattern."
+"Warning: You have entered an insecure passphrase.%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:238
+#: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:240
+#: agent/genkey.c:253
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:246
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:290
+#: agent/genkey.c:306
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Cal una contrasenya per a protegir la clau secreta.\n"
 "\n"
 
-#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "canvia la contrasenya"
-
-#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
-#: tools/symcryptrun.c:456
-msgid "does not match - try again"
-msgstr ""
-
-#: agent/genkey.c:412
+#: agent/genkey.c:429
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:104
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -285,68 +302,67 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:109
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
 # Un dels dos és en la llista d'opcions amb --help. Urgh. jm
-#: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:69 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detall"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:341
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "una mica més silenciós"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:112
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:113
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
-#: tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cerca claus en un servidor de claus"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:134
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualitza la base de dades de confiança"
@@ -384,150 +400,165 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:91 tools/symcryptrun.c:204
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Si us plau, informeu sobre els errors a <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:512 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:340 sm/gpgsm.c:819 sm/gpgsm.c:822 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, 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:610 agent/gpg-agent.c:1177 g10/gpg.c:2027
-#: scd/scdaemon.c:421 sm/gpgsm.c:914 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: agent/gpg-agent.c:947 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:1247 agent/gpg-agent.c:1373 agent/gpg-agent.c:1377
-#: agent/gpg-agent.c:1418 agent/gpg-agent.c:1422 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:908
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
+#: agent/gpg-agent.c:1321
+#, fuzzy, c-format
+msgid "socket name `%s' is too long\n"
+msgstr "Certificat de revocació vàlid"
+
+#: agent/gpg-agent.c:1333
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
+#, fuzzy
+msgid "error getting nonce for the socket\n"
+msgstr "error en crear «%s»: %s\n"
+
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: s'ha creat el directori\n"
 
-#: agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1448
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1438
+#: agent/gpg-agent.c:1452
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: no s'ha pogut crear el directori: %s\n"
 
-#: agent/gpg-agent.c:1549
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
+#, fuzzy, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "error en la lectura de «%s»: %s\n"
+
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1554
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1571
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1576
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "ha fallat l'actualització de la clau secreta: %s\n"
 
-#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu claus es descarta\n"
 
-#: agent/gpg-agent.c:1809
+#: agent/gpg-agent.c:1850
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:756
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
 
-#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
-#: tools/gpg-connect-agent.c:767
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
@@ -554,40 +585,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1188
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1191
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/protect-tool.c:1216
+#: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1221
+#: agent/protect-tool.c:1199
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "la contrasenya és errònia"
 
-#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancel·la"
@@ -700,7 +731,8 @@ msgstr "canvia la contrasenya"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1338
+#: tools/gpgconf-comp.c:1641
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
@@ -852,80 +884,85 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:366
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr "la capçalera d'armadura és invàlida: "
 
-#: g10/armor.c:416
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr "capçalera d'armadura: "
 
-#: g10/armor.c:427
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr "la capçalera de signatura clara és invàlida\n"
 
+#: g10/armor.c:455
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "capçalera d'armadura: "
+
 # És un missatge d'error?  ivb
 # «Anidada» és un castellanisme.  Niuades?  Imbricades (SC)??  ivb
-#: g10/armor.c:479
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr "signatures en text pla imbricades\n"
 
 # FIXME: un-indiar. jm
-#: g10/armor.c:614
+#: g10/armor.c:643
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:626
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr "la línia escapada amb guió és invàlida: "
 
-#: g10/armor.c:780 g10/armor.c:1390
+#: g10/armor.c:809 g10/armor.c:1419
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "el caràcter radix64 %02x invàlid s'ha omés\n"
 
-#: g10/armor.c:823
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr "fi de fitxer prematur (no CRC)\n"
 
-#: g10/armor.c:857
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr "fi de fitxer prematur (en CRC)\n"
 
-#: g10/armor.c:865
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr "CRC malformat\n"
 
-#: g10/armor.c:869 g10/armor.c:1427
+#: g10/armor.c:898 g10/armor.c:1456
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "error de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:889
+#: g10/armor.c:918
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fí de fitxer prematur (al final)\n"
 
-#: g10/armor.c:893
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr "error en l'última línia\n"
 
-#: g10/armor.c:1204
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr "no s'han trobat dades OpenPGP vàlides.\n"
 
-#: g10/armor.c:1209
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "l'armadura és invàlida: la línia és més llarga que %d caràcters\n"
 
-#: g10/armor.c:1213
+#: g10/armor.c:1242
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1272,11 +1309,11 @@ msgstr ""
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no és vàlida (proveu «help»)\n"
 
-#: g10/decrypt.c:110 g10/encode.c:890
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no s'ha pogut obrir «%s»\n"
@@ -1287,7 +1324,7 @@ msgstr "no s'ha pogut obrir «%s»\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1332,7 +1369,7 @@ msgstr "hi ha una clau secreta per a la clau pública «%s»!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utilitzeu l'opció «--delete-secret-keys» per a eliminar-la primer.\n"
 
-#: g10/encode.c:226 g10/sign.c:1296
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
@@ -1351,7 +1388,7 @@ msgstr "Ha fallat el procés de signatura: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVÍS: «%s» és un fitxer buit\n"
@@ -1380,7 +1417,7 @@ msgid ""
 msgstr ""
 "forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
 
-#: g10/encode.c:669 g10/sign.c:966
+#: g10/encode.c:655 g10/sign.c:936
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1389,18 +1426,18 @@ msgstr ""
 "forçar l'algoritme de compressió %s (%d) viola les preferències del "
 "destinatari\n"
 
-#: g10/encode.c:765
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
 
-#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/encode.c:862
+#: g10/encode.c:848
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s xifrat per a: «%s»\n"
@@ -1597,7 +1634,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:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1605,135 +1642,135 @@ msgstr ""
 "@Ordres:\n"
 " "
 
-#: g10/gpg.c:370
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[fitxer]|crea una signatura"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: g10/gpg.c:372 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "crea una signatura separada"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "xifra dades"
 
-#: g10/gpg.c:375 sm/gpgsm.c:248
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr "xifra només amb xifratge simètric"
 
-#: g10/gpg.c:377 sm/gpgsm.c:249
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "desxifra dades (predeterminat)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "verifica una signatura"
 
-#: g10/gpg.c:381 sm/gpgsm.c:252
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "llista claus"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "llista claus i signatures"
 
 # «de les claus» o «de la clau»?  ivb
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "comprova les signatures de la claus"
 
 # «dactilars» o «digitals»?  ivb
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "llista claus i empremtes digitals"
 
-#: g10/gpg.c:386 sm/gpgsm.c:254
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "llista claus secretes"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "remove keys from the public keyring"
 msgstr "elimina claus de l'anell públic"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "remove keys from the secret keyring"
 msgstr "elimina claus de l'anell secret"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "signa una clau"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "signa una clau localment"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "signa o edita una clau"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "genera un certificat de revocació"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "exporta claus"
 
-#: g10/gpg.c:397 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "exporta claus a un servidor de claus"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "importa claus d'un servidor de claus"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:402
 msgid "search for keys on a key server"
 msgstr "cerca claus en un servidor de claus"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "update all keys from a keyserver"
 msgstr "actualitza totes les claus des d'un servidor de claus"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "importa/fon claus"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:410
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr "actualitza la base de dades de confiança"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fitxers]|imprimeix resums de missatges"
 
-#: g10/gpg.c:430 sm/gpgsm.c:264
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1743,47 +1780,48 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:281
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr "crea eixida amb armadura ascii"
 
-#: g10/gpg.c:436 sm/gpgsm.c:293
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/gpg.c:447 sm/gpgsm.c:331
+#: g10/gpg.c:449 sm/gpgsm.c:333
 msgid "use this user-id to sign or decrypt"
 msgstr "usa aquest id per a signar o desxifrar"
 
-#: g10/gpg.c:448 sm/gpgsm.c:334
+#: g10/gpg.c:450 sm/gpgsm.c:336
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivell de compressió N (0 no comprimeix)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:336
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr "usa el mode de text canònic"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
-msgid "use as output file"
-msgstr "fitxer d'eixida"
+#: g10/gpg.c:469 sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "no fa cap canvi"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "pregunta abans de sobreescriure"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:524
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:397
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1794,7 +1832,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:556 sm/gpgsm.c:400
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1814,15 +1852,15 @@ msgstr ""
 " --list-keys [noms]         mostra claus\n"
 " --fingerprint [noms]       mostra empremtes digitals\n"
 
-#: g10/gpg.c:750 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Si us plau, informeu sobre els errors a <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:767
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1837,7 +1875,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:781 sm/gpgsm.c:578
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1845,566 +1883,570 @@ msgstr ""
 "\n"
 "Algoritmes suportats:\n"
 
-#: g10/gpg.c:784
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr "Clau pública: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Xifratge: "
 
-#: g10/gpg.c:798
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr "Dispersió: "
 
-#: g10/gpg.c:805 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Compressió: "
 
-#: g10/gpg.c:875
+#: g10/gpg.c:817 sm/gpgsm.c:603
+msgid "Used libraries:"
+msgstr ""
+
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:715
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/gpg.c:1063
+#: g10/gpg.c:1113
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no s'ha trobat cap signe = a la definició de grup «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1260
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1263
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1266
+#: g10/gpg.c:1316
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1272
+#: g10/gpg.c:1322
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1325
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1328
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1284
+#: g10/gpg.c:1334
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1337
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1340
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1296
+#: g10/gpg.c:1346
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1349
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1352
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1445
+#: g10/gpg.c:1495
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1594
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1602
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1610
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra en quin anell de claus està una clau llistada"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1612
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1825
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1981
+#: g10/gpg.c:2030
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n"
 
-#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s no és per a ús normal!\n"
 
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2493
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: g10/gpg.c:2528
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2610
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2613
 msgid "invalid import options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2620
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2551
+#: g10/gpg.c:2623
 msgid "invalid export options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2630
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2561
+#: g10/gpg.c:2633
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2645
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2653
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2655
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2659
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2670
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2673
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "no s'ha pogut fixar l'exec-path a %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2855
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1298
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVÍS: el programa podria crear un fitxer core!\n"
 
 # FIXME: preferència? jm
 # Ho discutírem en la llista, segur.  Deu ser als arxius.  ivb
-#: g10/gpg.c:2875
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVÍS: %s té preferència sobre %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no té sentit amb %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2975
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
 # clares -> en clar?  ivb
-#: g10/gpg.c:2916
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "només podeu fer signatures separades o en clar en el mode --pgp2\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no podeu signar i xifrar al mateix temps en el mode --pgp2\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "heu d'utilitzar fitxers (i no un conducte) mentre treballeu amb --pgp2 "
 "habilitat.\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:3014
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1370
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1378
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3092
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3098
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3117
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ha d'estar en el rang 1 a 255\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3119
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3121
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el mode S2K simple (0) no és gens recomanable\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "el mode S2K és invàlid; ha de ser 0, 1 o 3\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3135
 msgid "invalid default preferences\n"
 msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3144
 msgid "invalid personal cipher preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3148
 msgid "invalid personal digest preferences\n"
 msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3152
 msgid "invalid personal compress preferences\n"
 msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3185
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3232
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de xifratge «%s» mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3237
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3242
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de compressió %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVÍS: s'han donat destinataris (-r) sense usar xifratge de clau pública\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3375
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3403
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3449
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3454
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3474
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3630
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3641
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3651
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4233
 msgid "the given certification policy URL is invalid\n"
 msgstr "la URL de política de certificació donada no és vàlida\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4235
 msgid "the given signature policy URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4268
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
@@ -2417,7 +2459,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:75 sm/gpgsm.c:372
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr "|FD|escriu informació d'estat en aquest FD"
 
@@ -2958,13 +3000,13 @@ msgstr "clau %08lX: clau nova - es descarta \n"
 msgid "no writable keyring found: %s\n"
 msgstr "no s'ha trobat cap anell escrivible: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "s'està escrivint en «%s»\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2369 g10/import.c:2391
+#: g10/import.c:2381 g10/import.c:2403
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
@@ -3054,7 +3096,7 @@ msgstr "clau %08lX: clau secreta amb xifrat %d no vàlid - es descarta\n"
 msgid "importing secret keys not allowed\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/import.c:1158 g10/import.c:2384
+#: g10/import.c:1158 g10/import.c:2396
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hi ha anell secret predeterminat: %s\n"
@@ -3187,46 +3229,46 @@ msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "clau %08lX: la classe de signatura és inesperada (0x%02x) - es descarta\n"
 
-#: g10/import.c:1732
+#: g10/import.c:1744
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clau %08lX: s'ha detectat un ID d'usuari duplicat - es fusiona\n"
 
-#: g10/import.c:1794
+#: g10/import.c:1806
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVÍS: la clau %08lX pot estar revocada: s'adquireix la clau de revocació %"
 "08lX\n"
 
-#: g10/import.c:1808
+#: g10/import.c:1820
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVÍS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està "
 "present.\n"
 
-#: g10/import.c:1867
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clau %08lX: s'hi ha afegit el certificat de revocació «%s»\n"
 
-#: g10/import.c:1901
+#: g10/import.c:1913
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2302
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "la clau pública no coincideix amb la clau secreta!\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2310
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2312
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
@@ -3553,7 +3595,7 @@ msgid "Really sign? (y/N) "
 msgstr "Signar realment? "
 
 #: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:348
+#: g10/keyedit.c:5019 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
@@ -3930,8 +3972,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Realment voleu revocar aquesta clau? "
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
 #: g10/keyedit.c:2140
@@ -4836,7 +4877,7 @@ msgid "Key generation failed: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
 # Werner FIXME: Use ngettext. jm
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:273
+#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4845,7 +4886,7 @@ msgstr ""
 "amb el rellotge)\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:275
+#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5462,17 +5503,17 @@ msgstr "No comprimit"
 msgid "uncompressed|none"
 msgstr "No comprimit"
 
-#: g10/misc.c:874
+#: g10/misc.c:891
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "aquest missatge pot no ser usable per %s\n"
 
-#: g10/misc.c:1049
+#: g10/misc.c:1066
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: g10/misc.c:1074
+#: g10/misc.c:1091
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
@@ -5532,7 +5573,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquet de tipus %d té el bit crític activat\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:603
+#: g10/passphrase.c:295 g10/passphrase.c:581
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID de la clau principal %08lX)"
@@ -5548,7 +5589,7 @@ msgstr " (ID de la clau principal %08lX)"
 # Se't passava l'argument «*».  printf(3), hieroglyph(7).  ivb
 # Ah!  Prova-ho, no casque alguna cosa :P  ivb
 # Ah, ja veig! Moltes gràcies! Aquest msgstr ha quedat curiós :) jm
-#: g10/passphrase.c:327
+#: g10/passphrase.c:309
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5559,24 +5600,24 @@ msgstr ""
 "«%2$.*1$s»\n"
 "clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:334
 msgid "Repeat passphrase\n"
 msgstr "Repetiu la contrasenya\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:336
 msgid "Enter passphrase\n"
 msgstr "Introduïu la contrasenya\n"
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:363
 msgid "cancelled by user\n"
 msgstr "s'ha cancel·lat per l'usuari\n"
 
-#: g10/passphrase.c:384 g10/passphrase.c:450
+#: g10/passphrase.c:369 g10/passphrase.c:428
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
 
-#: g10/passphrase.c:582
+#: g10/passphrase.c:560
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5586,12 +5627,12 @@ msgstr ""
 "Necessiteu la contrasenya per desblocar la clau secreta de\n"
 "l'usuari: \""
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:568
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s"
 
-#: g10/passphrase.c:599
+#: g10/passphrase.c:577
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6244,36 +6285,14 @@ msgstr ""
 "clau %08lX: no hi ha una subclau per a la signatura de l'enllaç de la "
 "subclau\n"
 
-#: g10/sign.c:82
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"no es poden ficar dades de notació dins de signatures v3 (estil PGP 2.x)\n"
-
-#: g10/sign.c:90
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-"no es poden ficar dades de notació dins de signatures de clau v3 (estil PGP "
-"2.x)\n"
-
-#: g10/sign.c:104
+#: g10/sign.c:89
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVÍS: no s'ha pogut %%-expandir la notació (massa gran). S'utilitza no "
 "expandida.\n"
 
-#: g10/sign.c:121
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"no es pot ficar una URL de política dins de signatures v3 (estil PGP 2.x)\n"
-
-#: g10/sign.c:129
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-"no es pot ficar una URL de política dins de signatures de clau v3 (estil PGP "
-"2.x)\n"
-
-#: g10/sign.c:142
+#: g10/sign.c:115
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6281,7 +6300,7 @@ msgstr ""
 "AVÍS: no s'ha pogut %%-expandir l'url de política (massa gran). S'utilitza "
 "no expandida.\n"
 
-#: g10/sign.c:170
+#: g10/sign.c:138
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6290,39 +6309,39 @@ msgstr ""
 "AVÍS: no s'ha pogut %%-expandir l'url de política (massa gran). S'utilitza "
 "no expandida.\n"
 
-#: g10/sign.c:343
+#: g10/sign.c:311
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: g10/sign.c:352
+#: g10/sign.c:320
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatura de: «%s»\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "només podeu fer signatures separades amb claus d'estil PGP 2.x mentre esteu "
 "en mode --pgp2\n"
 
-#: g10/sign.c:864
+#: g10/sign.c:834
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forçar l'algoritme de digest %s (%d) viola les preferències del destinatari\n"
 
-#: g10/sign.c:991
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "signatura:"
 
-#: g10/sign.c:1106
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "només podeu signar en clar amb claus d'estil PGP 2.x en el mode --pgp2\n"
 
-#: g10/sign.c:1290
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "s'utilitzarà xifratge %s\n"
@@ -7048,64 +7067,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:114 sm/gpgsm.c:361
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 #, fuzzy
 msgid "read options from file"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "no usa el terminal en absolut"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:135
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "les ordres entren en conflicte\n"
 
-#: scd/scdaemon.c:209
+#: scd/scdaemon.c:210
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: scd/scdaemon.c:211
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:658
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1006
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1011
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7139,11 +7158,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1631
+#: sm/certchain.c:195 sm/certchain.c:1646
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1631
+#: sm/certchain.c:196 sm/certchain.c:1646
 #, fuzzy
 msgid "shell"
 msgstr "ajuda"
@@ -7184,8 +7203,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
@@ -7363,7 +7382,7 @@ msgstr ""
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1730
+#: sm/certchain.c:1462 sm/certchain.c:1745
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "Certificat de revocació vàlid"
@@ -7380,11 +7399,11 @@ msgstr ""
 "No s'han trobat certificats amb confiança no definida.\n"
 "\n"
 
-#: sm/certchain.c:1620
+#: sm/certchain.c:1635
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1629
+#: sm/certchain.c:1644
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7399,7 +7418,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7413,20 +7432,20 @@ msgstr "no"
 msgid "[none]"
 msgstr "[no establert]"
 
-#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
+#: sm/certdump.c:583 sm/certdump.c:628 sm/certdump.c:693 sm/certdump.c:746
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: sm/certdump.c:558 sm/certdump.c:603
+#: sm/certdump.c:591 sm/certdump.c:636
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:640 sm/certdump.c:696
+#: sm/certdump.c:673 sm/certdump.c:729
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:665 sm/certdump.c:719
+#: sm/certdump.c:698 sm/certdump.c:752
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "error: l'empremta digital és invàlida\n"
@@ -7442,7 +7461,7 @@ msgstr "error: l'empremta digital és invàlida\n"
 # Se't passava l'argument «*».  printf(3), hieroglyph(7).  ivb
 # Ah!  Prova-ho, no casque alguna cosa :P  ivb
 # Ah, ja veig! Moltes gràcies! Aquest msgstr ha quedat curiós :) jm
-#: sm/certdump.c:936
+#: sm/certdump.c:946
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7569,182 +7588,191 @@ msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(No es va donar una descripció)\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[fitxer]|crea una signatura"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list external keys"
 msgstr "llista claus secretes"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "elimina claus de l'anell públic"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificat correcte"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificat correcte"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:270
 #, fuzzy
 msgid "change a passphrase"
 msgstr "canvia la contrasenya"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crea eixida amb armadura ascii"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "use the default key as default recipient"
 msgstr "usa la clau predeterminada com a destinatari predeterminat"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr "no usa el terminal en absolut"
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:345
+msgid "|FILE|write a server mode log to FILE"
+msgstr ""
+
+#: sm/gpgsm.c:347
+#, fuzzy
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FITXER|carrega el mòdul d'extensió especificat"
+
+#: sm/gpgsm.c:349
 msgid "force v3 signatures"
 msgstr "força signatures v3"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr "sempre utilitza un MDC per a xifrar"
 
 # Mode desatès (SC)  ivb
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr "mode desatès: no pregunta mai"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr "suposa «sí» en la majoria de les preguntes"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr "suposa «no» en la majoria de les preguntes"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:359
 msgid "add this keyring to the list of keyrings"
 msgstr "afegeix aquest anell a la llista"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:360
 msgid "add this secret keyring to the list"
 msgstr "afegeix aquest anell secret a la llista"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|usa NOM com a clau secreta predeterminada"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|usa aquest servidor per a cercar claus"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:363
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|el joc de caràcters serà NOM"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:379
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:388
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|usa l'algoritme de xifratge NOM"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:390
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|usa l'algoritme de resum de missatges NOM"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:392
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritme de compressió N"
 
-#: sm/gpgsm.c:568
+#: sm/gpgsm.c:573
 #, 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:571
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7755,37 +7783,37 @@ msgstr ""
 "signa, comprova, xifra o desxifra\n"
 "l'operació predeterminada depén de les dades introduïdes\n"
 
-#: sm/gpgsm.c:650
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: sm/gpgsm.c:748
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "no s'ha pogut connectar amb «%s»: %s\n"
 
-#: sm/gpgsm.c:759
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: sm/gpgsm.c:1315
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1411
+#: sm/gpgsm.c:1468
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
 # No em passe! ;)  ivb
-#: sm/gpgsm.c:1429
+#: sm/gpgsm.c:1486
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: sm/gpgsm.c:1612
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7808,7 +7836,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:1274
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -7871,17 +7899,17 @@ msgstr "error en la lectura de «%s»: %s\n"
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:111
+#: sm/qualified.c:105
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: sm/qualified.c:129
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:225
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7892,13 +7920,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234 sm/verify.c:536
+#: sm/qualified.c:209 sm/verify.c:580
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:327
+#: sm/qualified.c:277
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7911,293 +7939,311 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:424
 #, fuzzy
 msgid "Signature made "
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:428
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:429
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: sm/verify.c:514
+#: sm/verify.c:558
 #, fuzzy
 msgid "Good signature from"
 msgstr "Signatura correcta de \""
 
-#: sm/verify.c:515
+#: sm/verify.c:559
 #, fuzzy
 msgid "                aka"
 msgstr "              alias \""
 
-#: sm/verify.c:533
+#: sm/verify.c:577
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr ""
 "\n"
 "Açò serà una autosignatura.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "ix"
 
-#: tools/gpg-connect-agent.c:60
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:127
+#: tools/gpg-connect-agent.c:74
+#, fuzzy
+msgid "|FILE|run commands from FILE on startup"
+msgstr "|FITXER|carrega el mòdul d'extensió especificat"
+
+#: tools/gpg-connect-agent.c:75
+msgid "run /subst on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:174
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: tools/gpg-connect-agent.c:130
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:314
+#: tools/gpg-connect-agent.c:1155
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:323
+#: tools/gpg-connect-agent.c:1164
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:381
+#: tools/gpg-connect-agent.c:1219 tools/gpg-connect-agent.c:1645
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
+
+#: tools/gpg-connect-agent.c:1299
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "la línia és massa llarga\n"
 
-#: tools/gpg-connect-agent.c:385
+#: tools/gpg-connect-agent.c:1303
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:1619
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:1637
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: tools/gpg-connect-agent.c:473
-#, fuzzy, c-format
-msgid "receiving line failed: %s\n"
-msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
-
-#: tools/gpg-connect-agent.c:789
+#: tools/gpg-connect-agent.c:1986
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: tools/gpg-connect-agent.c:798
+#: tools/gpg-connect-agent.c:1995
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
-#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
+#: tools/gpgconf-comp.c:459 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:773
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:796
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
-#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
+#: tools/gpgconf-comp.c:482 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:803
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
-#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:487 tools/gpgconf-comp.c:606 tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:729 tools/gpgconf-comp.c:811
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:737
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:504
+#: tools/gpgconf-comp.c:502
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:506
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:512
+#: tools/gpgconf-comp.c:510
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:526
+#: tools/gpgconf-comp.c:524
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:527
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:531
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:535
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:539
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:543
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|usa el mode de contrasenya especificat"
 
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:547
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:710
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOM|xifra per a NOM"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:669
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:674
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:719
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOM|usa l'algoritme de xifratge NOM per a les contrasenyes"
 
-#: tools/gpgconf-comp.c:744
+#: tools/gpgconf-comp.c:742
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:786
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:824
+#: tools/gpgconf-comp.c:822
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:834
+#: tools/gpgconf-comp.c:832
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:845
+#: tools/gpgconf-comp.c:843
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:850
+#: tools/gpgconf-comp.c:848
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:887
+#: tools/gpgconf-comp.c:885
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2982
+#: tools/gpgconf-comp.c:3006
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:59
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
+#, fuzzy
+msgid "list global configuration file"
+msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
+
+#: tools/gpgconf.c:67
 #, fuzzy
 msgid "check global configuration file"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:71
+msgid "use as output file"
+msgstr "fitxer d'eixida"
+
+#: tools/gpgconf.c:75
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:100
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:176 tools/gpgconf.c:209
+#: tools/gpgconf.c:202 tools/gpgconf.c:240
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: tools/gpgconf.c:178
+#: tools/gpgconf.c:204
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:187
+#: tools/gpgconf.c:213
 #, fuzzy
 msgid "Component not found"
 msgstr "no s'ha trobat la clau pública"
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:242
 msgid "No argument allowed"
 msgstr ""
 
@@ -8291,92 +8337,111 @@ msgid "error closing %s: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
 # Execució de programes remots, o execució remota de programes? jm
-#: tools/symcryptrun.c:515
+#: tools/symcryptrun.c:486
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "no hi ha suport per a l'execució remota de programes\n"
 
-#: tools/symcryptrun.c:521
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:556
+#: tools/symcryptrun.c:527
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: tools/symcryptrun.c:563
+#: tools/symcryptrun.c:534
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: tools/symcryptrun.c:579
+#: tools/symcryptrun.c:550
 #, fuzzy, c-format
 msgid "could not fork: %s\n"
 msgstr "%s: no s'ha trobat l'usuari: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:578
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: tools/symcryptrun.c:636
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: tools/symcryptrun.c:653
+#: tools/symcryptrun.c:624
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: tools/symcryptrun.c:705
+#: tools/symcryptrun.c:676
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: tools/symcryptrun.c:757
+#: tools/symcryptrun.c:728
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: tools/symcryptrun.c:771
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:826
+#: tools/symcryptrun.c:797
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "%s: no s'ha creat l'anell: %s\n"
 
-#: tools/symcryptrun.c:839
+#: tools/symcryptrun.c:810
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: tools/symcryptrun.c:1014
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1041
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1050
+#: tools/symcryptrun.c:1021
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "no es poden ficar dades de notació dins de signatures v3 (estil PGP 2.x)\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "no es poden ficar dades de notació dins de signatures de clau v3 (estil "
+#~ "PGP 2.x)\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "no es pot ficar una URL de política dins de signatures v3 (estil PGP 2."
+#~ "x)\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "no es pot ficar una URL de política dins de signatures de clau v3 (estil "
+#~ "PGP 2.x)\n"
+
 #, fuzzy
 #~ msgid "shelll"
 #~ msgstr "ajuda"
diff --git a/po/cs.po b/po/cs.po
index 751227463..977bdb275 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.3.92\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-09-14 13:27+0200\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
 "PO-Revision-Date: 2004-11-26 09:12+0200\n"
 "Last-Translator: Roman Pavlik <rp@tns.cz>\n"
 "Language-Team: Czech <translations.cs@gnupg.cz>\n"
@@ -15,59 +15,76 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "ulo�en� fingerprintu se nezda�ilo: %s\n"
 
-#: agent/call-pinentry.c:438
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:441
+#: agent/call-pinentry.c:551
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: agent/call-pinentry.c:489
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+#, fuzzy
+msgid "Quality:"
+msgstr "platnost: %s"
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 #, fuzzy
 msgid "PIN too long"
 msgstr "��dek je p��li� dlouh�"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:668
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "��dek je p��li� dlouh�"
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:676
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Neplatn� znak ve jm�n�\n"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:535
+#: agent/call-pinentry.c:693
 #, fuzzy
 msgid "Bad PIN"
 msgstr "�patn� MPI"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:694
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "�patn� heslo"
 
-#: agent/call-pinentry.c:572
+#: agent/call-pinentry.c:730
 #, fuzzy
 msgid "Passphrase"
 msgstr "�patn� heslo"
@@ -77,21 +94,21 @@ msgstr "�patn� heslo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ochrann� algoritmus %d nen� podporov�n\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
-#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1865
-#: sm/gpgsm.c:1902 sm/gpgsm.c:1940 sm/qualified.c:72
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
@@ -131,14 +148,25 @@ msgstr "chyba p�i z�pisu souboru kl��� (keyring)  `%s': %s\n"
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: agent/command-ssh.c:2349
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "zm�nit heslo"
+
+#: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2850
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/command-ssh.c:2885
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: nepoda�ilo se vytvo�it hashovac� tabulku: %s\n"
@@ -183,76 +211,66 @@ msgstr "Vlo�it heslo\n"
 msgid "Take this one anyway"
 msgstr "Pou��t p�esto tento kl��? (a/N) "
 
-#: agent/genkey.c:185
+#: agent/genkey.c:191
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u character long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u characters long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:202
+#: agent/genkey.c:212
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digit or special character."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digits or special characters."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:225
+#: agent/genkey.c:235
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
-"passphrase may not%0Abe a known term or match certain pattern."
+"Warning: You have entered an insecure passphrase.%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:238
+#: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:240
+#: agent/genkey.c:253
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:246
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:290
+#: agent/genkey.c:306
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Pro ochranu Va�eho tajn�ho kl��e mus�te zadat heslo.\n"
 "\n"
 
-#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "zm�nit heslo"
-
-#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
-#: tools/symcryptrun.c:456
-msgid "does not match - try again"
-msgstr ""
-
-#: agent/genkey.c:412
+#: agent/genkey.c:429
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "zm�nit heslo"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:104
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -262,66 +280,65 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:109
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:69 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "s dodate�n�mi informacemi"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:341
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "b�t o trochu v�c tich�"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:112
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:113
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
-#: tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "vyhledat kl��e na serveru kl���"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:134
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "nastavit sadu preferenc� pro vybran� u�ivatelsk� ID"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualizovat datab�zi d�v�ry"
@@ -359,152 +376,167 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:91 tools/symcryptrun.c:204
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
 "Chyby oznamte, pros�m, na adresu <gnupg-bugs@gnu.org>.\n"
 "P�ipom�nky k p�ekladu <rp@tns.cz>.\n"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:512 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:340 sm/gpgsm.c:819 sm/gpgsm.c:822 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, 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:610 agent/gpg-agent.c:1177 g10/gpg.c:2027
-#: scd/scdaemon.c:421 sm/gpgsm.c:914 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:947 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "chyba p�i vytv��en� `%s': %s\n"
 
-#: agent/gpg-agent.c:1247 agent/gpg-agent.c:1373 agent/gpg-agent.c:1377
-#: agent/gpg-agent.c:1418 agent/gpg-agent.c:1422 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:908
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nemohu vytvo�it adres�� `%s': %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
+#: agent/gpg-agent.c:1321
+#, c-format
+msgid "socket name `%s' is too long\n"
+msgstr ""
+
+#: agent/gpg-agent.c:1333
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
+#, fuzzy
+msgid "error getting nonce for the socket\n"
+msgstr "chyba p�i z�sk�n� nov�ho PINu: %s\n"
+
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "chyba p�i hled�n� z�znamu d�v�ryhodnosti v `%s': %s\n"
 
-#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "adres�� `%s' vytvo�en\n"
 
-#: agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1448
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) selhal v %s: %s\n"
 
-#: agent/gpg-agent.c:1438
+#: agent/gpg-agent.c:1452
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "nemohu vytvo�it adres�� `%s': %s\n"
 
-#: agent/gpg-agent.c:1549
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
+#, fuzzy, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "chyba p�i �ten� `%s': %s\n"
+
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1554
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1571
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1576
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
 
-#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: p�esko�eno: %s\n"
 
-#: agent/gpg-agent.c:1809
+#: agent/gpg-agent.c:1850
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:756
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "�patn� form�t prom�nn� prost�ed� GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
-#: tools/gpg-connect-agent.c:767
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verze %d nen� podporov�n\n"
@@ -531,40 +563,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1188
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1191
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: agent/protect-tool.c:1216
+#: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1221
+#: agent/protect-tool.c:1199
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "�patn� heslo"
 
-#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "zru�eno"
@@ -676,7 +708,8 @@ msgstr "zm�nit heslo"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1338
+#: tools/gpgconf-comp.c:1641
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
@@ -824,75 +857,80 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:366
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII k�dov�n�: %s\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr "neplatn� hlavi�ka ASCII k�dov�n�: "
 
-#: g10/armor.c:416
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr "ASCII hlavi�ka: "
 
-#: g10/armor.c:427
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr "neplatn� hlavi�ka podpisu v �iteln�m form�tu\n"
 
-#: g10/armor.c:479
+#: g10/armor.c:455
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "ASCII hlavi�ka: "
+
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr "vno�en� podpisy v �iteln�m form�tu\n"
 
-#: g10/armor.c:614
+#: g10/armor.c:643
 msgid "unexpected armor: "
 msgstr "neo�ek�van� ASCII armor: "
 
-#: g10/armor.c:626
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr "nespr�vn� ozna�en� ��dku m�nusy: "
 
-#: g10/armor.c:780 g10/armor.c:1390
+#: g10/armor.c:809 g10/armor.c:1419
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "neplatn� radix64 znak %02X byl p�esko�en\n"
 
-#: g10/armor.c:823
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr "p�ed�asn� konec souboru (��dn� CRC)\n"
 
-#: g10/armor.c:857
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr "p�ed�asn� konec souboru (��dn� CRC)\n"
 
-#: g10/armor.c:865
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr "�patn� form�t CRC\n"
 
-#: g10/armor.c:869 g10/armor.c:1427
+#: g10/armor.c:898 g10/armor.c:1456
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Chyba CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:889
+#: g10/armor.c:918
 msgid "premature eof (in trailer)\n"
 msgstr "p�ed�asn� konec souboru (v pati�ce)\n"
 
-#: g10/armor.c:893
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr "chyba v pati�ce\n"
 
-#: g10/armor.c:1204
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenalezena ��dn� platn� data ve form�tu OpenPGP.\n"
 
-#: g10/armor.c:1209
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "neplatn� k�dov�n� ASCII: ��dek je del�� ne� %d znak�\n"
 
-#: g10/armor.c:1213
+#: g10/armor.c:1242
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1211,11 +1249,11 @@ msgstr "administr�torsk� p��kazy nejsou povoleny\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 
-#: g10/decrypt.c:110 g10/encode.c:890
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento p��kaz nen� platn�\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nelze otev��t `%s'\n"
@@ -1226,7 +1264,7 @@ msgstr "nelze otev��t `%s'\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "kl�� \"%s\" nenalezen: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1267,7 +1305,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "abyste ho smazal(a), pou�ijte nejprve parametr \"--delete-secret-key\".\n"
 
-#: g10/encode.c:226 g10/sign.c:1296
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
@@ -1286,7 +1324,7 @@ msgstr "pou�it� �ifry: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' je ji� zkomprimov�n\n"
 
-#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROV�N�: soubor `%s' je pr�zdn�\n"
@@ -1313,7 +1351,7 @@ msgid ""
 msgstr ""
 "VAROV�N�: vy��dan� symetrick� �ifra %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/encode.c:669 g10/sign.c:966
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1322,17 +1360,17 @@ msgstr ""
 "VAROV�N�: vy��dan� komprima�n� algoritmus %s (%d) nevyhovuje p�edvolb�m "
 "p��jemce\n"
 
-#: g10/encode.c:765
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vy��dan� symetrick� �ifra %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "pou�it� %s nen� v m�du %s dovoleno\n"
 
-#: g10/encode.c:862
+#: g10/encode.c:848
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s za�ifrovan� pro: %s\n"
@@ -1515,7 +1553,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:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1523,132 +1561,132 @@ msgstr ""
 "@P��kazy:\n"
 " "
 
-#: g10/gpg.c:370
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[soubor]|vytvo�it podpis"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
 
-#: g10/gpg.c:372 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "vytvo�it podpis odd�len� od dokumentu"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "�ifrovat data"
 
-#: g10/gpg.c:375 sm/gpgsm.c:248
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrov�n� pouze se symetrickou �ifrou"
 
-#: g10/gpg.c:377 sm/gpgsm.c:249
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "de�ifrovat data (implicitn�)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "verifikovat podpis"
 
-#: g10/gpg.c:381 sm/gpgsm.c:252
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "vypsat seznam kl���"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "vypsat seznam kl��� a podpis�"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "list and check key signatures"
 msgstr "vypsat a zkontrolovat podpisy kl���"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "vypsat seznam kl��� a fingerprint�"
 
-#: g10/gpg.c:386 sm/gpgsm.c:254
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "vypsat seznam tajn�ch kl���"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "remove keys from the public keyring"
 msgstr "odstranit kl�� ze souboru ve�ejn�ch kl���"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "remove keys from the secret keyring"
 msgstr "odstranit kl�� ze souboru tajn�ch kl���"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "podepsat kl��"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "podepsat kl�� lok�ln�"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "podepsat nebo modifikovat kl��"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "vytvo�it revoka�n� certifik�t"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "exportovat kl��e"
 
-#: g10/gpg.c:397 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "exportovat kl��e na server kl���"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "importovat kl��e ze serveru kl���"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:402
 msgid "search for keys on a key server"
 msgstr "vyhledat kl��e na serveru kl���"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "update all keys from a keyserver"
 msgstr "aktualizovat v�echny kl��e ze serveru kl���"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "importovat/slou�it kl��e"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr "vytisknout stav karty"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr "zm�nit data na kart�"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr "zm�nit PIN karty"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr "aktualizovat datab�zi d�v�ry"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr "|algo [soubory]  vypi� hash"
 
-#: g10/gpg.c:430 sm/gpgsm.c:264
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1658,51 +1696,52 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:281
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
 
-#: g10/gpg.c:436 sm/gpgsm.c:293
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|JM�NO|�ifrovat pro JM�NO"
 
-#: g10/gpg.c:447 sm/gpgsm.c:331
+#: g10/gpg.c:449 sm/gpgsm.c:333
 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:448 sm/gpgsm.c:334
+#: g10/gpg.c:450 sm/gpgsm.c:336
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavit �rov�� komprimace N (0 - ��dn�\n"
 " komprimace)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:336
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr "pou��t kanonick� textov� m�d"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
-msgid "use as output file"
-msgstr "pou��t jako v�stupn� soubor"
+#: g10/gpg.c:469 sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "�tu mo�nosti z `%s'\n"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "neprov�d�t ��dn� zm�ny"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "vy��dat potvrzen� p�ed p�eps�n�m"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr "pou��t chov�n� striktn� podle OpenPGP"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr "generovat zpr�vu komplatibiln� s PGP 2.x"
 
-#: g10/gpg.c:553 sm/gpgsm.c:397
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1710,7 +1749,7 @@ msgstr ""
 "@\n"
 "(Pou�ijte manu�lov� str�nky pro kompletn� seznam v�ech p��kaz� a mo�nost�)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:400
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1728,17 +1767,17 @@ msgstr ""
 " --list-keys [jm�na]        vypsat kl��e\n"
 " --fingerprint [jm�na]      vypsat fingerprinty \n"
 
-#: g10/gpg.c:750 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Chyby oznamte, pros�m, na adresu <gnupg-bugs@gnu.org>.\n"
 "P�ipom�nky k p�ekladu <rp@tns.cz>.\n"
 
-#: g10/gpg.c:767
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1748,7 +1787,7 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:578
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1756,79 +1795,83 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/gpg.c:784
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr "Ve�ejn� kl��: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "�ifra: "
 
-#: g10/gpg.c:798
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:805 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Komprese: "
 
-#: g10/gpg.c:875
+#: g10/gpg.c:817 sm/gpgsm.c:603
+msgid "Used libraries:"
+msgstr ""
+
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: g10/gpg.c:1045 sm/gpgsm.c:715
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "konfliktn� p��kazy\n"
 
-#: g10/gpg.c:1063
+#: g10/gpg.c:1113
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = podpis nalezen v definici skupiny `%s'\n"
 
 # g10/g10.c:1179#, c-format
-#: g10/gpg.c:1260
+#: g10/gpg.c:1310
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� domovsk�ho adres��e nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1263
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� konfigura�n�ho souboru nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1266
+#: g10/gpg.c:1316
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� roz�i�uj�c�ho modulu nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1272
+#: g10/gpg.c:1322
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va pro domovsk� adres��e nejsou bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1325
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va pro konfigura�n� soubor nejsou bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1328
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROV�N�: p��stupov� pr�va roz�i�uj�c�mu modulu nejsou bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1284
+#: g10/gpg.c:1334
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� adres��e s domovk�m adres��em nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1337
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1836,21 +1879,21 @@ msgstr ""
 "VAROV�N�: vlastnictv� adres��e s konfigura�n�m souborem nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1340
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� adres��e s roz�i�uj�c�m modulem nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/gpg.c:1296
+#: g10/gpg.c:1346
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va k adres��i s domovsk�m adres��em nejsou nastavena "
 "bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1349
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1858,7 +1901,7 @@ msgstr ""
 "VAROV�N�: p��stupov� pr�va k aders��i s konfigura�n�m souborem nejsou "
 "nastavena bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1352
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
@@ -1866,463 +1909,463 @@ msgstr ""
 "nastavena bezpe�n� `%s'\n"
 
 # c-format
-#: g10/gpg.c:1445
+#: g10/gpg.c:1495
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1594
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1602
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1610
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "p�epnout mezi vypisem seznamu tajn�ch a ve�ejn�ch kl���"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1612
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/gpg.c:1825
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1981
+#: g10/gpg.c:2030
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZN�MKA: star� implicitn� soubor s mo�nostmi `%s ignorov�n'\n"
 
-#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nen� pro norm�ln� pou�it�!\n"
 
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2493
+#: g10/gpg.c:2565
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nen� platn� znakov� sada\n"
 
-#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru kl���\n"
 
-#: g10/gpg.c:2528
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2603
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2610
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2613
 msgid "invalid import options\n"
 msgstr "neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2620
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2551
+#: g10/gpg.c:2623
 msgid "invalid export options\n"
 msgstr "neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2630
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2561
+#: g10/gpg.c:2633
 msgid "invalid list options\n"
 msgstr "neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2645
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2653
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2655
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2659
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2670
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2673
 msgid "invalid verify options\n"
 msgstr "neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2855
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1298
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s p�ep��e %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nen� dovoleno pou��vat %s s %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�v� s %s smysl!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2975
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nelze spustit s nebezpe�nou pam�t� vzhledem k %s\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytv��et pouze odd�len� podpisy nebo podpisy �iteln� "
 "jako text\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v m�du --pgp2 nelze sou�asn� �ifrovat a podepisovat\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v m�du --pgp2 mus�te pou��t soubor (ne rouru).\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:3014
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1370
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1378
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3092
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� komprimovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3098
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� b�t v�t�� ne� 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� b�t v�t�� ne� 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3117
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "polo�ka max-cert-depth mus� b�t v rozmez� od 1 do 255\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3119
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "neplatn� implicitn� �rove� certifikace (default-cert-level); mus� b�t 0, 1, "
 "2 nebo 3\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3121
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "neplatn� minim�ln� �rove� certifikace (min-cert-level); mus� b�t 0, 1, 2 "
 "nebo 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razn� nedoporu�ov�n\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatn� m�d S2K; mus� b�t 0, 1 nebo 3\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3135
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� p�edvolby\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3144
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro �ifrov�n�\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3148
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro hashov�n�\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3152
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro komprimaci\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3185
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud nen� funk�n� s %s\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3232
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "pou�it� �ifrovac�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3237
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "pou�it� hashovac�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3242
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pou�it� komprima�n�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROV�N�: specifikov�n adres�t (-r) bez pou�it� �ifrov�n� s ve�ejn�m kl��em\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [jm�no souboru]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3375
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symetrick� �ifrov�n� `%s' se nepovedlo: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3398
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nelze pou��t --symmetric --encrypt s p��kazem --s2k-mode 0\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nelze pou��t --symmetric --encrypt v m�du %s\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--sign [jm�no souboru]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3449
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nelze pou��t --symmetric --sign --encrypt s p��kazem --s2k-mode 0\n"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3454
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nelze pou��t --symmetric --sign --encrypt v m�du %s\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3474
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jm�no souboru]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jm�no souboru]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key id u�ivatele"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u�ivatele"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u�ivatele [p��kazy]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3630
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export kl��e se nepoda�il: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3641
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hled�n� na keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3651
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh dat na keyserveru se nezda�il: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[jm�no souboru]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�n�te ps�t svou zpr�vu ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4233
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pro certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4235
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4268
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
@@ -2334,7 +2377,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:75 sm/gpgsm.c:372
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapsat informace o stavu do tohoto FD"
 
@@ -2876,13 +2919,13 @@ msgid "no writable keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor kl��� (keyring): %s\n"
 
 # g10/import.c:766 g10/openfile.c:261#, c-format
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisuji do '%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2369 g10/import.c:2391
+#: g10/import.c:2381 g10/import.c:2403
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu souboru kl��� (keyring)  `%s': %s\n"
@@ -2971,7 +3014,7 @@ msgstr "kl�� %s: tajn� kl�� s neplatnou �ifrou %d - p�esko�eno\n"
 msgid "importing secret keys not allowed\n"
 msgstr "import tajn�ch kl��� nen� povolen\n"
 
-#: g10/import.c:1158 g10/import.c:2384
+#: g10/import.c:1158 g10/import.c:2396
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nen� nastaven implicitn� soubor tajn�ch kl��� %s\n"
@@ -3093,41 +3136,41 @@ msgstr "kl�� %s: podpis podkl��e na �patn�m m�st� - p�esko�eno \n"
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "kl�� %s: neo�ek�van� podpisov� t��da (0x%02X) - p�esko�eno\n"
 
-#: g10/import.c:1732
+#: g10/import.c:1744
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kl�� %s: objeven duplikovan� identifik�tor u�ivatele - slou�en\n"
 
-#: g10/import.c:1794
+#: g10/import.c:1806
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROV�N�: kl�� %s m��e b�t revokov�n: zkou��m z�skat revoka�n� kl�� %s\n"
 
-#: g10/import.c:1808
+#: g10/import.c:1820
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "VAROV�N�: kl�� %s m��e b�t revokov�n: revoka�n� kl�� %s nenalezen.\n"
 
-#: g10/import.c:1867
+#: g10/import.c:1879
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kl�� %s: \"%s\" p�id�n revoka�n� certifik�t\n"
 
-#: g10/import.c:1901
+#: g10/import.c:1913
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kl�� %s: podpis kl��e j�m sam�m (direct key signature) p�id�n\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2302
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "POZN�MKA: S/N kl��e neodpov�d� S/N karty\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2310
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "POZN�MKA: prim�rn� kl�� je online a je ulo�en na kart�\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2312
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "POZN�MKA: sekund�rn� kl�� je online a je ulo�en na kart�\n"
 
@@ -3433,7 +3476,7 @@ msgid "Really sign? (y/N) "
 msgstr "Skute�n� podepsat? (a/N) "
 
 #: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:348
+#: g10/keyedit.c:5019 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podeps�n� selhalo: %s\n"
@@ -3769,8 +3812,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Opravdu chcete revokovat tento podkl��? (a/N) "
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "D�v�ryhodnost vlastn�ka nelze m�nit je-li pou��v�na datab�ze d�v�ry "
 "poskytnut� u�ivatelem\n"
@@ -4630,7 +4672,7 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:273
+#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4638,7 +4680,7 @@ msgstr ""
 "kl�� byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
 "je probl�m se syst�mov�m �asem)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:275
+#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5234,17 +5276,17 @@ msgstr "Nezakomprimov�no"
 msgid "uncompressed|none"
 msgstr "nezakomprimov�no|nic"
 
-#: g10/misc.c:874
+#: g10/misc.c:891
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "tato zpr�va nemus� b�t s %s pou�iteln�\n"
 
-#: g10/misc.c:1049
+#: g10/misc.c:1066
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "nejednozna�n� volby `%s'\n"
 
-#: g10/misc.c:1074
+#: g10/misc.c:1091
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "nezn�m� volba `%s'\n"
@@ -5300,12 +5342,12 @@ msgstr "VAROV�N�: potencion�ln� nebezpe�n� symetricky za�ifrov�n kl�� sezen�\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:603
+#: g10/passphrase.c:295 g10/passphrase.c:581
 #, c-format
 msgid " (main key ID %s)"
 msgstr "(hlavn� ID kl��e %s)"
 
-#: g10/passphrase.c:327
+#: g10/passphrase.c:309
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5316,24 +5358,24 @@ msgstr ""
 "\"%.*s\"\n"
 "Kl�� o d�lce %u bit�, typ %s, ID %s, vytvo�en� %s%s\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:334
 msgid "Repeat passphrase\n"
 msgstr "Opakovat heslo\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:336
 msgid "Enter passphrase\n"
 msgstr "Vlo�it heslo\n"
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:363
 msgid "cancelled by user\n"
 msgstr "zru�eno u�ivatelem\n"
 
-#: g10/passphrase.c:384 g10/passphrase.c:450
+#: g10/passphrase.c:369 g10/passphrase.c:428
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "probl�m s agentem - pou��v�n� agenta vypnuto\n"
 
-#: g10/passphrase.c:582
+#: g10/passphrase.c:560
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5342,12 +5384,12 @@ msgstr ""
 "Mus�te zn�t heslo, abyste odemknul(a) tajn� kl�� pro\n"
 "u�ivatele: \"%s\"\n"
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:568
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�lka %u bit�, typ %s, kl�� %s, vytvo�en� %s"
 
-#: g10/passphrase.c:599
+#: g10/passphrase.c:577
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (podkl�� na hlavn�m kl��i ID %s)"
@@ -5969,31 +6011,14 @@ msgstr "kl�� %s: neexistuje podkl�� pro revokaci podkl��e\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "kl�� %s: podkl�� kter� je sv�z�n s podpisem neexistuje\n"
 
-#: g10/sign.c:82
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"notaci (notation) nelze ulo�it ve form�tu v3 podpisu (form�t PGP 2.x)\n"
-
-#: g10/sign.c:90
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "notaci (notation) nelze ulo�it jako v3 podpis kl��e (form�t PGP 2.x)\n"
-
-#: g10/sign.c:104
+#: g10/sign.c:89
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "VAROV�N�: nelze %%-expandovat notaci (p��li� dlouh�). Pou�ity "
 "neexpandovan�.\n"
 
-#: g10/sign.c:121
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "URL politiky nelze ulo�it ve form�tu v3 podpisu (form�t PGP 2.x)\n"
-
-#: g10/sign.c:129
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr "nelze ulo�it URL politiky do podpisu v3 kl��em (form�t PGP 2.x)\n"
-
-#: g10/sign.c:142
+#: g10/sign.c:115
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6001,7 +6026,7 @@ msgstr ""
 "VAROV�N�: nemohu %%-expandovat URL politiky (p��li� dlouh�). Pou�ity "
 "neexpandovan�.\n"
 
-#: g10/sign.c:170
+#: g10/sign.c:138
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6010,23 +6035,23 @@ msgstr ""
 "VAROV�N�: nemohu %%-expandovat URL preferovan�ho keyservery (p��li� dlouh�). "
 "Pou�ity neexpandovan�.\n"
 
-#: g10/sign.c:343
+#: g10/sign.c:311
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
 
-#: g10/sign.c:352
+#: g10/sign.c:320
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s podpis od: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytvo�it pouze odd�len� podpis (detach-sign)s kl��i "
 "form�tu PGP-2.x\n"
 
-#: g10/sign.c:864
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6034,16 +6059,16 @@ msgstr ""
 "VAROV�N�: vy��dan� hashovac� algoritmus %s (%d) nevyhovuje p�edvolb�m "
 "p��jemce\n"
 
-#: g10/sign.c:991
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "podepisuji:"
 
-#: g10/sign.c:1106
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytv��et jen �iteln� podpisy s kl��i form�tu PGP-2.x\n"
 
-#: g10/sign.c:1290
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�ito �ifrov�n� %s\n"
@@ -6751,61 +6776,61 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "p��stup na %s se nezda�il - vadn� OpenPGP karta?\n"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:114 sm/gpgsm.c:361
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 #, fuzzy
 msgid "read options from file"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:122
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:123
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:126
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:135
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "zobraz administr�torsk� p��kazy"
 
-#: scd/scdaemon.c:209
+#: scd/scdaemon.c:210
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: scd/scdaemon.c:211
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:658
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1006
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1011
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6839,11 +6864,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1631
+#: sm/certchain.c:195 sm/certchain.c:1646
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1631
+#: sm/certchain.c:196 sm/certchain.c:1646
 msgid "shell"
 msgstr ""
 
@@ -6883,8 +6908,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "nelze ulo�it kl��: %s\n"
@@ -7053,7 +7078,7 @@ msgstr ""
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1730
+#: sm/certchain.c:1462 sm/certchain.c:1745
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "duplicita p�edvolby `%s'\n"
@@ -7068,11 +7093,11 @@ msgstr "Revoka�n� certifik�t vytvo�en.\n"
 msgid "root certificate is good\n"
 msgstr "�patn� certifik�t"
 
-#: sm/certchain.c:1620
+#: sm/certchain.c:1635
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1629
+#: sm/certchain.c:1644
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7087,7 +7112,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7101,25 +7126,25 @@ msgstr "ne"
 msgid "[none]"
 msgstr "[nen� nastaven]"
 
-#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
+#: sm/certdump.c:583 sm/certdump.c:628 sm/certdump.c:693 sm/certdump.c:746
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "Chyba: neplatn� odpov��.\n"
 
-#: sm/certdump.c:558 sm/certdump.c:603
+#: sm/certdump.c:591 sm/certdump.c:636
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:640 sm/certdump.c:696
+#: sm/certdump.c:673 sm/certdump.c:729
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:665 sm/certdump.c:719
+#: sm/certdump.c:698 sm/certdump.c:752
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "Chyba: neplatn� odpov��.\n"
 
-#: sm/certdump.c:936
+#: sm/certdump.c:946
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7246,190 +7271,199 @@ msgstr "smaz�n� bloku kl��e se nezda�ilo:  %s\n"
 msgid "no valid recipients given\n"
 msgstr "(Nebyl zad�n ��dn� popis)\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[soubor]|vytvo�it podpis"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list external keys"
 msgstr "vypsat seznam tajn�ch kl���"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
 #, fuzzy
 msgid "list certificate chain"
 msgstr "�patn� certifik�t"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "odstranit kl�� ze souboru ve�ejn�ch kl���"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "import certificates"
 msgstr "�patn� certifik�t"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "export certificates"
 msgstr "�patn� certifik�t"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "register a smartcard"
 msgstr "p�idat kl�� na kartu"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:270
 #, fuzzy
 msgid "change a passphrase"
 msgstr "zm�nit heslo"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 #, 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:342
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:345
+msgid "|FILE|write a server mode log to FILE"
+msgstr ""
+
+#: sm/gpgsm.c:347
+#, fuzzy
+msgid "|FILE|write an audit log to FILE"
+msgstr "�tu mo�nosti z `%s'\n"
+
+#: sm/gpgsm.c:349
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "kontrolovat podpisy"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:359
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "ber kl��e z t�to kl��enky (keyringu)"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:360
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "Pro proveden� t�to operace je pot�eba tajn� kl��.\n"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:363
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|JM�NO|�ifrovat pro JM�NO"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:379
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:388
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "nezn�m� �ifrovac� algoritmus"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:390
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:392
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "nezn�m� komprima�n� algoritmus"
 
-#: sm/gpgsm.c:568
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: sm/gpgsm.c:571
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7440,36 +7474,36 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: sm/gpgsm.c:650
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: sm/gpgsm.c:748
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "nemohu se p�ipojit k `%s': %s\n"
 
-#: sm/gpgsm.c:759
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "nezn�m� volba `%s'\n"
 
-#: sm/gpgsm.c:1315
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1411
+#: sm/gpgsm.c:1468
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1429
+#: sm/gpgsm.c:1486
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: sm/gpgsm.c:1612
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7492,7 +7526,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:1274
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
@@ -7555,17 +7589,17 @@ msgstr "chyba p�i �ten� `%s': %s\n"
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:111
+#: sm/qualified.c:105
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "Chyba: nespr�vn� naform�tovan� fingerprint.\n"
 
-#: sm/qualified.c:129
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:225
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7576,13 +7610,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234 sm/verify.c:536
+#: sm/qualified.c:209 sm/verify.c:580
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:327
+#: sm/qualified.c:277
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7595,291 +7629,310 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:424
 #, fuzzy
 msgid "Signature made "
 msgstr "Podpis vytvo�en %s\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:428
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:429
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
 
-#: sm/verify.c:514
+#: sm/verify.c:558
 #, fuzzy
 msgid "Good signature from"
 msgstr "Dobr� podpis od \"%s\""
 
-#: sm/verify.c:515
+#: sm/verify.c:559
 #, fuzzy
 msgid "                aka"
 msgstr "                alias \"%s\""
 
-#: sm/verify.c:533
+#: sm/verify.c:577
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "Jedn� se o podpis kl��e j�m sam�m.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "ukon�it"
 
-#: tools/gpg-connect-agent.c:60
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:127
+#: tools/gpg-connect-agent.c:74
+#, fuzzy
+msgid "|FILE|run commands from FILE on startup"
+msgstr "�tu mo�nosti z `%s'\n"
+
+#: tools/gpg-connect-agent.c:75
+msgid "run /subst on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:174
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: tools/gpg-connect-agent.c:130
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:314
+#: tools/gpg-connect-agent.c:1155
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:323
+#: tools/gpg-connect-agent.c:1164
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:381
+#: tools/gpg-connect-agent.c:1219 tools/gpg-connect-agent.c:1645
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "�ten� ve�ejn�ho kl��e se nezda�ilo: %s\n"
+
+#: tools/gpg-connect-agent.c:1299
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "��dek je p��li� dlouh�"
 
-#: tools/gpg-connect-agent.c:385
+#: tools/gpg-connect-agent.c:1303
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:1619
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "nezn�m� volba `%s'\n"
 
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:1637
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "podeps�n� selhalo: %s\n"
 
-#: tools/gpg-connect-agent.c:473
-#, fuzzy, c-format
-msgid "receiving line failed: %s\n"
-msgstr "�ten� ve�ejn�ho kl��e se nezda�ilo: %s\n"
-
-#: tools/gpg-connect-agent.c:789
+#: tools/gpg-connect-agent.c:1986
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:798
+#: tools/gpg-connect-agent.c:1995
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "chyba p�i hled�n� z�znamu d�v�ryhodnosti v `%s': %s\n"
 
-#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
-#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
+#: tools/gpgconf-comp.c:459 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:773
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:796
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
-#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
+#: tools/gpgconf-comp.c:482 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:803
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
-#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:487 tools/gpgconf-comp.c:606 tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:729 tools/gpgconf-comp.c:811
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:737
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:504
+#: tools/gpgconf-comp.c:502
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:506
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:512
+#: tools/gpgconf-comp.c:510
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:526
+#: tools/gpgconf-comp.c:524
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:527
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:531
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:535
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:539
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:543
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "revokovat kl�� nebo vybran� podkl��e"
 
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:547
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:710
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|JM�NO|�ifrovat pro JM�NO"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:669
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "nelze zpracovat URL serveru kl���\n"
 
-#: tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:674
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:719
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:744
+#: tools/gpgconf-comp.c:742
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:786
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:824
+#: tools/gpgconf-comp.c:822
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:834
+#: tools/gpgconf-comp.c:832
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:845
+#: tools/gpgconf-comp.c:843
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:850
+#: tools/gpgconf-comp.c:848
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:887
+#: tools/gpgconf-comp.c:885
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2982
+#: tools/gpgconf-comp.c:3006
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:59
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "apply global default values"
 msgstr ""
 
 # c-format
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
+#, fuzzy
+msgid "list global configuration file"
+msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
+
+# c-format
+#: tools/gpgconf.c:67
 #, fuzzy
 msgid "check global configuration file"
 msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:71
+msgid "use as output file"
+msgstr "pou��t jako v�stupn� soubor"
+
+#: tools/gpgconf.c:75
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:100
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:176 tools/gpgconf.c:209
+#: tools/gpgconf.c:202 tools/gpgconf.c:240
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: tools/gpgconf.c:178
+#: tools/gpgconf.c:204
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:187
+#: tools/gpgconf.c:213
 #, fuzzy
 msgid "Component not found"
 msgstr "ve�ejn� kl�� nenalezen"
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:242
 #, fuzzy
 msgid "No argument allowed"
 msgstr "administr�torsk� p��kazy nejsou povoleny\n"
@@ -7973,92 +8026,106 @@ msgstr "chyba p�i �ten� `%s': %s\n"
 msgid "error closing %s: %s\n"
 msgstr "chyba v `%s': %s\n"
 
-#: tools/symcryptrun.c:515
+#: tools/symcryptrun.c:486
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "spu�t�n� extern�ho programu nen� podporov�no\n"
 
-#: tools/symcryptrun.c:521
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:556
+#: tools/symcryptrun.c:527
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: tools/symcryptrun.c:563
+#: tools/symcryptrun.c:534
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: tools/symcryptrun.c:579
+#: tools/symcryptrun.c:550
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:578
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: tools/symcryptrun.c:636
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "smaz�n� bloku kl��e se nezda�ilo:  %s\n"
 
-#: tools/symcryptrun.c:653
+#: tools/symcryptrun.c:624
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: tools/symcryptrun.c:705
+#: tools/symcryptrun.c:676
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: tools/symcryptrun.c:757
+#: tools/symcryptrun.c:728
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: tools/symcryptrun.c:771
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:826
+#: tools/symcryptrun.c:797
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "nemohu vytvo�it z�lohu souboru `%s': %s\n"
 
-#: tools/symcryptrun.c:839
+#: tools/symcryptrun.c:810
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "nemohu vytvo�it z�lohu souboru `%s': %s\n"
 
-#: tools/symcryptrun.c:1014
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1041
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1050
+#: tools/symcryptrun.c:1021
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "ochrann� algoritmus %d nen� podporov�n\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "notaci (notation) nelze ulo�it ve form�tu v3 podpisu (form�t PGP 2.x)\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "notaci (notation) nelze ulo�it jako v3 podpis kl��e (form�t PGP 2.x)\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "URL politiky nelze ulo�it ve form�tu v3 podpisu (form�t PGP 2.x)\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr "nelze ulo�it URL politiky do podpisu v3 kl��em (form�t PGP 2.x)\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
diff --git a/po/da.po b/po/da.po
index fa9e87aa7..b4d423d1e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-09-14 13:27+0200\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
 "PO-Revision-Date: 2003-12-03 16:11+0100\n"
 "Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -17,56 +17,72 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 # er det klogt at overs�tte TrustDB?
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: agent/call-pinentry.c:438
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:441
+#: agent/call-pinentry.c:551
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 
-#: agent/call-pinentry.c:489
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+msgid "Quality:"
+msgstr ""
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 msgid "PIN too long"
 msgstr ""
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:668
 msgid "Passphrase too long"
 msgstr ""
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:676
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:535
+#: agent/call-pinentry.c:693
 #, fuzzy
 msgid "Bad PIN"
 msgstr "d�rlig mpi"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:694
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "d�rlig kodes�tning"
 
-#: agent/call-pinentry.c:572
+#: agent/call-pinentry.c:730
 #, fuzzy
 msgid "Passphrase"
 msgstr "d�rlig kodes�tning"
@@ -76,21 +92,21 @@ msgstr "d�rlig kodes�tning"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
-#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1865
-#: sm/gpgsm.c:1902 sm/gpgsm.c:1940 sm/qualified.c:72
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
@@ -130,15 +146,26 @@ msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr ""
 
-#: agent/command-ssh.c:2349
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "�ndr kodes�tningen"
+
+#: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
+msgid "does not match - try again"
+msgstr ""
+
 # er det klogt at overs�tte TrustDB?
-#: agent/command-ssh.c:2850
+#: agent/command-ssh.c:2885
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
@@ -184,76 +211,66 @@ msgstr "Indtast kodes�tning: "
 msgid "Take this one anyway"
 msgstr "Brug denne n�gle alligevel? "
 
-#: agent/genkey.c:185
+#: agent/genkey.c:191
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u character long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u characters long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:202
+#: agent/genkey.c:212
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digit or special character."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digits or special characters."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:225
+#: agent/genkey.c:235
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
-"passphrase may not%0Abe a known term or match certain pattern."
+"Warning: You have entered an insecure passphrase.%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:238
+#: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:240
+#: agent/genkey.c:253
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:246
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:290
+#: agent/genkey.c:306
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "�ndr kodes�tningen"
-
-#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
-#: tools/symcryptrun.c:456
-msgid "does not match - try again"
-msgstr ""
-
-#: agent/genkey.c:412
+#: agent/genkey.c:429
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:104
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -263,66 +280,65 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:109
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:69 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "meddelsom"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:341
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "v�r mere stille"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:112
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:113
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
-#: tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:134
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "opdat�r tillidsdatabasen"
@@ -360,148 +376,163 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:91 tools/symcryptrun.c:204
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Rapport�r venligst fejl til <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:512 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:340 sm/gpgsm.c:819 sm/gpgsm.c:822 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: agent/gpg-agent.c:610 agent/gpg-agent.c:1177 g10/gpg.c:2027
-#: scd/scdaemon.c:421 sm/gpgsm.c:914 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: agent/gpg-agent.c:947 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, fuzzy, c-format
 msgid "error creating `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/gpg-agent.c:1247 agent/gpg-agent.c:1373 agent/gpg-agent.c:1377
-#: agent/gpg-agent.c:1418 agent/gpg-agent.c:1422 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:908
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
+#: agent/gpg-agent.c:1321
+#, fuzzy, c-format
+msgid "socket name `%s' is too long\n"
+msgstr "certifikatl�seproblem: %s\n"
+
+#: agent/gpg-agent.c:1333
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
+#, fuzzy
+msgid "error getting nonce for the socket\n"
+msgstr "fejl ved oprettelse af kodes�tning: %s\n"
+
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: mappe oprettet\n"
 
-#: agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1448
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: agent/gpg-agent.c:1438
+#: agent/gpg-agent.c:1452
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: agent/gpg-agent.c:1549
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
+#, fuzzy, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "fejl ved l�sning af '%s': %s\n"
+
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1554
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1571
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1576
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: udelod: %s\n"
 
-#: agent/gpg-agent.c:1809
+#: agent/gpg-agent.c:1850
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:756
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
-#: tools/gpg-connect-agent.c:767
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:1964
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
@@ -528,37 +559,37 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1188
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1191
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1216
+#: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1221
+#: agent/protect-tool.c:1199
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "d�rlig kodes�tning"
 
-#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 msgid "cancelled\n"
 msgstr ""
 
@@ -669,7 +700,8 @@ msgstr "�ndr kodes�tningen"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1338
+#: tools/gpgconf-comp.c:1641
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
@@ -815,77 +847,82 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:366
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr "panser: %s\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr "ugyldigt panserhoved: "
 
-#: g10/armor.c:416
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr "panserhoved: "
 
-#: g10/armor.c:427
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr ""
 
-#: g10/armor.c:479
+#: g10/armor.c:455
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "panserhoved: "
+
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr ""
 
-#: g10/armor.c:614
+#: g10/armor.c:643
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "uforventet beskyttelse:"
 
-#: g10/armor.c:626
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr ""
 
-#: g10/armor.c:780 g10/armor.c:1390
+#: g10/armor.c:809 g10/armor.c:1419
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "ugyldigt radix64 tegn %02x udeladt\n"
 
-#: g10/armor.c:823
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr "for tidlig eof (ingen CRC)\n"
 
-#: g10/armor.c:857
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr "for tidlig eof (i CRC)\n"
 
-#: g10/armor.c:865
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr "d�rlig CRC\n"
 
-#: g10/armor.c:869 g10/armor.c:1427
+#: g10/armor.c:898 g10/armor.c:1456
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC fejl; %06lx - %06lx\n"
 
-#: g10/armor.c:889
+#: g10/armor.c:918
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "for tidlig eof (i trailer)\n"
 
-#: g10/armor.c:893
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/armor.c:1204
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/armor.c:1209
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ugyldigt panser: linie l�ngere end %d tegn\n"
 
-#: g10/armor.c:1213
+#: g10/armor.c:1242
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "quoted printable-tegn i panser - m�ske pga. en fejlbeh�ftet MTA\n"
@@ -1229,11 +1266,11 @@ msgstr "skriver hemmeligt certifikat til '%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/decrypt.c:110 g10/encode.c:890
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
@@ -1244,7 +1281,7 @@ msgstr "kan ikke �bne `%s'\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
@@ -1285,7 +1322,7 @@ msgstr ""
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:226 g10/sign.c:1296
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
@@ -1304,7 +1341,7 @@ msgstr "signering fejlede: %s\n"
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
@@ -1329,24 +1366,24 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:669 g10/sign.c:966
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr ""
 
-#: g10/encode.c:765
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 
-#: g10/encode.c:862
+#: g10/encode.c:848
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypteret for: %s\n"
@@ -1525,7 +1562,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:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1533,137 +1570,137 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/gpg.c:370
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/gpg.c:372 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "krypt�r data"
 
-#: g10/gpg.c:375 sm/gpgsm.c:248
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr "krypt�r kun med symmetriske cifre"
 
-#: g10/gpg.c:377 sm/gpgsm.c:249
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "afkrypt�r data (standard)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/gpg.c:381 sm/gpgsm.c:252
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "vis n�gler"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "vis n�gler og signaturer"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tjek n�glesignaturer"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/gpg.c:386 sm/gpgsm.c:254
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "vis hemmelige n�gler"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "sign�r en n�gle"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "sign�r eller redig�r en n�gle"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "eksport�r n�gler"
 
-#: g10/gpg.c:397 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:402
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "import�r/fusion�r n�gler"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:410
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr "opdat�r tillidsdatabasen"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresum�"
 
-#: g10/gpg.c:430 sm/gpgsm.c:264
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1673,53 +1710,54 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:281
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/gpg.c:436 sm/gpgsm.c:293
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|krypt�r for NAME"
 
-#: g10/gpg.c:447 sm/gpgsm.c:331
+#: g10/gpg.c:449 sm/gpgsm.c:333
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/gpg.c:448 sm/gpgsm.c:334
+#: g10/gpg.c:450 sm/gpgsm.c:336
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:336
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
-msgid "use as output file"
-msgstr "brug som uddatafil"
+#: g10/gpg.c:469 sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:523
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:524
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:397
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:556 sm/gpgsm.c:400
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1739,16 +1777,16 @@ msgstr ""
 " --list-keys [navne]        vis n�gler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/gpg.c:750 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Rapport�r venligst fejl til <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:767
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
 # Skal alt dette overs�ttes eller er det flagene?
-#: g10/gpg.c:770
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1758,7 +1796,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:578
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1766,566 +1804,570 @@ msgstr ""
 "\n"
 "Underst�ttede algoritmer:\n"
 
-#: g10/gpg.c:784
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:791 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:798
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:805 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 #, fuzzy
 msgid "Compression: "
 msgstr "Kommentar: "
 
-#: g10/gpg.c:875
+#: g10/gpg.c:817 sm/gpgsm.c:603
+msgid "Used libraries:"
+msgstr ""
+
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:715
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/gpg.c:1063
+#: g10/gpg.c:1113
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1260
+#: g10/gpg.c:1310
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1263
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1266
+#: g10/gpg.c:1316
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1272
+#: g10/gpg.c:1322
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1325
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1328
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1284
+#: g10/gpg.c:1334
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1337
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1340
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1296
+#: g10/gpg.c:1346
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1349
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1352
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1445
+#: g10/gpg.c:1495
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1594
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1602
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1610
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1612
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1825
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1981
+#: g10/gpg.c:2030
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2493
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/gpg.c:2528
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2610
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2613
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2620
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2551
+#: g10/gpg.c:2623
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2630
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2561
+#: g10/gpg.c:2633
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2645
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2653
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2655
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2659
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2670
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2673
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2855
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1298
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2975
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:3014
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1370
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1378
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3092
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3098
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3117
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3119
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3121
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simpel S2K modus (0) frar�des p� det skarpeste\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3135
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3144
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3148
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3152
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3185
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3232
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3237
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3242
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
 # er det klogt at overs�tte TrustDB?
-#: g10/gpg.c:3261
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3375
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3449
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3454
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3626
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3628
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3630
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3641
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3651
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4233
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4235
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4268
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
@@ -2340,7 +2382,7 @@ msgstr "Slet denne n�gle fra n�gleringen? "
 msgid "make timestamp conflicts only a warning"
 msgstr "tidsstempelkonflikt"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:372
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinfo til denne FD"
 
@@ -2779,13 +2821,13 @@ msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 msgid "no writable keyring found: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2369 g10/import.c:2391
+#: g10/import.c:2381 g10/import.c:2403
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
@@ -2875,7 +2917,7 @@ msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 msgid "importing secret keys not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/import.c:1158 g10/import.c:2384
+#: g10/import.c:1158 g10/import.c:2396
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
@@ -2995,41 +3037,41 @@ msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1732
+#: g10/import.c:1744
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1794
+#: g10/import.c:1806
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/import.c:1808
+#: g10/import.c:1820
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/import.c:1867
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:1901
+#: g10/import.c:1913
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2302
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2298
+#: g10/import.c:2310
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2312
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
@@ -3318,7 +3360,7 @@ msgid "Really sign? (y/N) "
 msgstr "Vil du gerne signere? "
 
 #: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:348
+#: g10/keyedit.c:5019 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
@@ -3679,8 +3721,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
 #: g10/keyedit.c:2140
@@ -4526,13 +4567,13 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:273
+#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:275
+#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5139,17 +5180,17 @@ msgstr "ikke bearbejdet"
 msgid "uncompressed|none"
 msgstr "ikke bearbejdet"
 
-#: g10/misc.c:874
+#: g10/misc.c:891
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1049
+#: g10/misc.c:1066
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/misc.c:1074
+#: g10/misc.c:1091
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
@@ -5206,12 +5247,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:313 g10/passphrase.c:603
+#: g10/passphrase.c:295 g10/passphrase.c:581
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hovedn�gle-ID %08lX)"
 
-#: g10/passphrase.c:327
+#: g10/passphrase.c:309
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5219,26 +5260,26 @@ msgid ""
 "%u-bit %s key, ID %s, created %s%s\n"
 msgstr ""
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:334
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:336
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Indtast kodes�tning: "
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:363
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:384 g10/passphrase.c:450
+#: g10/passphrase.c:369 g10/passphrase.c:428
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/passphrase.c:582
+#: g10/passphrase.c:560
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5247,12 +5288,12 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:568
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr ""
 
-#: g10/passphrase.c:599
+#: g10/passphrase.c:577
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5872,69 +5913,53 @@ msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/sign.c:82
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:90
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-
-#: g10/sign.c:104
+#: g10/sign.c:89
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:121
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:129
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:142
+#: g10/sign.c:115
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:170
+#: g10/sign.c:138
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:343
+#: g10/sign.c:311
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/sign.c:352
+#: g10/sign.c:320
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:864
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:991
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "signerer:"
 
-#: g10/sign.c:1106
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1290
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
@@ -6637,64 +6662,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:114 sm/gpgsm.c:361
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 #, fuzzy
 msgid "read options from file"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "brug overhovedet ikke terminalen"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:135
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "konfliktende kommandoer\n"
 
-#: scd/scdaemon.c:209
+#: scd/scdaemon.c:210
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: scd/scdaemon.c:211
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:658
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1006
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1011
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6727,11 +6752,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1631
+#: sm/certchain.c:195 sm/certchain.c:1646
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1631
+#: sm/certchain.c:196 sm/certchain.c:1646
 #, fuzzy
 msgid "shell"
 msgstr "hj�lp"
@@ -6773,8 +6798,8 @@ msgid "number of issuers matching: %d\n"
 msgstr ""
 
 # er det klogt at overs�tte TrustDB?
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
@@ -6943,7 +6968,7 @@ msgstr ""
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1730
+#: sm/certchain.c:1462 sm/certchain.c:1745
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "certifikatl�seproblem: %s\n"
@@ -6958,11 +6983,11 @@ msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 msgid "root certificate is good\n"
 msgstr "Godt certifikat"
 
-#: sm/certchain.c:1620
+#: sm/certchain.c:1635
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1629
+#: sm/certchain.c:1644
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -6977,7 +7002,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6991,25 +7016,25 @@ msgstr "n"
 msgid "[none]"
 msgstr "ukendt version"
 
-#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
+#: sm/certdump.c:583 sm/certdump.c:628 sm/certdump.c:693 sm/certdump.c:746
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "fejl i trailerlinie\n"
 
-#: sm/certdump.c:558 sm/certdump.c:603
+#: sm/certdump.c:591 sm/certdump.c:636
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:640 sm/certdump.c:696
+#: sm/certdump.c:673 sm/certdump.c:729
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:665 sm/certdump.c:719
+#: sm/certdump.c:698 sm/certdump.c:752
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "fejl i trailerlinie\n"
 
-#: sm/certdump.c:936
+#: sm/certdump.c:946
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7135,182 +7160,191 @@ msgstr "fjernelse af beskyttelse fejlede: %s\n"
 msgid "no valid recipients given\n"
 msgstr "ingen gyldige adresser\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list external keys"
 msgstr "vis hemmelige n�gler"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
 #, fuzzy
 msgid "list certificate chain"
 msgstr "ugyldigt certifikat"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "import certificates"
 msgstr "Godt certifikat"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "export certificates"
 msgstr "Godt certifikat"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:270
 #, fuzzy
 msgid "change a passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "opret ascii beskyttet uddata"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "use the default key as default recipient"
 msgstr "brug standard n�glen som standard modtager"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr "brug overhovedet ikke terminalen"
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:345
+msgid "|FILE|write a server mode log to FILE"
+msgstr ""
+
+#: sm/gpgsm.c:347
+#, fuzzy
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FILE|indl�s udvidelsesmodul FILE"
+
+#: sm/gpgsm.c:349
 msgid "force v3 signatures"
 msgstr "tving v3 signaturer"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr "brug altid en MDC for kryptering"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr "k�rselsmodus: sp�rg aldrig"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr "forvent ja til de fleste spr�gsm�l"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr "forvent nej til de fleste spr�gsm�l"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:359
 msgid "add this keyring to the list of keyrings"
 msgstr "tilf�j denne n�glering til n�gleringslisten"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:360
 msgid "add this secret keyring to the list"
 msgstr "tilf�j denne hemmeligen�glering til listen"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|brug NAME som standard hemmelign�gle"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|brug denne n�gletjener til at sl� n�gler op"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:363
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|s�t terminal karakters�t til NAME"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:379
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:388
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|brug cifferalgoritme NAME"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:390
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|brug meddelelsesresum� algoritme NAME"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:392
 msgid "|N|use compress algorithm N"
 msgstr "|N|brug kompresalgoritme N"
 
-#: sm/gpgsm.c:568
+#: sm/gpgsm.c:573
 #, 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:571
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7321,36 +7355,36 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: sm/gpgsm.c:650
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "brug: gpg [flag] "
 
-#: sm/gpgsm.c:748
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: sm/gpgsm.c:759
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: sm/gpgsm.c:1315
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1411
+#: sm/gpgsm.c:1468
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: sm/gpgsm.c:1429
+#: sm/gpgsm.c:1486
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: sm/gpgsm.c:1612
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7373,7 +7407,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:1274
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
@@ -7438,17 +7472,17 @@ msgstr "fejl ved l�sning af '%s': %s\n"
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:111
+#: sm/qualified.c:105
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "fejl i trailerlinie\n"
 
-#: sm/qualified.c:129
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:225
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7459,13 +7493,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234 sm/verify.c:536
+#: sm/qualified.c:209 sm/verify.c:580
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:327
+#: sm/qualified.c:277
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7478,292 +7512,310 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:424
 #, fuzzy
 msgid "Signature made "
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:428
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:429
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: sm/verify.c:514
+#: sm/verify.c:558
 #, fuzzy
 msgid "Good signature from"
 msgstr "God signatur fra \""
 
-#: sm/verify.c:515
+#: sm/verify.c:559
 #, fuzzy
 msgid "                aka"
 msgstr "              alias \""
 
-#: sm/verify.c:533
+#: sm/verify.c:577
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "afslut"
 
-#: tools/gpg-connect-agent.c:60
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:127
+#: tools/gpg-connect-agent.c:74
+#, fuzzy
+msgid "|FILE|run commands from FILE on startup"
+msgstr "|FILE|indl�s udvidelsesmodul FILE"
+
+#: tools/gpg-connect-agent.c:75
+msgid "run /subst on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:174
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: tools/gpg-connect-agent.c:130
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:314
+#: tools/gpg-connect-agent.c:1155
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:323
+#: tools/gpg-connect-agent.c:1164
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:381
+#: tools/gpg-connect-agent.c:1219 tools/gpg-connect-agent.c:1645
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "fjernelse af beskyttelse fejlede: %s\n"
+
+#: tools/gpg-connect-agent.c:1299
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: tools/gpg-connect-agent.c:385
+#: tools/gpg-connect-agent.c:1303
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:1619
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:1637
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: tools/gpg-connect-agent.c:473
-#, fuzzy, c-format
-msgid "receiving line failed: %s\n"
-msgstr "fjernelse af beskyttelse fejlede: %s\n"
-
-#: tools/gpg-connect-agent.c:789
+#: tools/gpg-connect-agent.c:1986
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: tools/gpg-connect-agent.c:798
+#: tools/gpg-connect-agent.c:1995
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
-#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
+#: tools/gpgconf-comp.c:459 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:773
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:796
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
-#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
+#: tools/gpgconf-comp.c:482 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:803
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "sl� fuld fejltjekning til"
 
-#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
-#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:487 tools/gpgconf-comp.c:606 tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:729 tools/gpgconf-comp.c:811
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:737
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:504
+#: tools/gpgconf-comp.c:502
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:506
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:512
+#: tools/gpgconf-comp.c:510
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:526
+#: tools/gpgconf-comp.c:524
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:527
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:531
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:535
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:539
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:543
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|brug pasfrasemodus N"
 
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:547
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:710
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|krypt�r for NAME"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:669
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:674
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:719
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|brug cifrealgoritme NAME for pasfrase"
 
-#: tools/gpgconf-comp.c:744
+#: tools/gpgconf-comp.c:742
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:786
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:824
+#: tools/gpgconf-comp.c:822
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:834
+#: tools/gpgconf-comp.c:832
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:845
+#: tools/gpgconf-comp.c:843
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:850
+#: tools/gpgconf-comp.c:848
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:887
+#: tools/gpgconf-comp.c:885
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2982
+#: tools/gpgconf-comp.c:3006
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:59
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
+#, fuzzy
+msgid "list global configuration file"
+msgstr "ukendt standard modtager '%s'\n"
+
+#: tools/gpgconf.c:67
 #, fuzzy
 msgid "check global configuration file"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:71
+msgid "use as output file"
+msgstr "brug som uddatafil"
+
+#: tools/gpgconf.c:75
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:100
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:176 tools/gpgconf.c:209
+#: tools/gpgconf.c:202 tools/gpgconf.c:240
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "brug: gpg [flag] "
 
-#: tools/gpgconf.c:178
+#: tools/gpgconf.c:204
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:187
+#: tools/gpgconf.c:213
 #, fuzzy
 msgid "Component not found"
 msgstr "offentlig n�gle ikke fundet"
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:242
 #, fuzzy
 msgid "No argument allowed"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
@@ -7856,87 +7908,87 @@ msgstr "fejl ved l�sning af '%s': %s\n"
 msgid "error closing %s: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: tools/symcryptrun.c:515
+#: tools/symcryptrun.c:486
 msgid "no --program option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:521
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:556
+#: tools/symcryptrun.c:527
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: tools/symcryptrun.c:563
+#: tools/symcryptrun.c:534
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: tools/symcryptrun.c:579
+#: tools/symcryptrun.c:550
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:578
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: tools/symcryptrun.c:636
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: tools/symcryptrun.c:653
+#: tools/symcryptrun.c:624
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: tools/symcryptrun.c:705
+#: tools/symcryptrun.c:676
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: tools/symcryptrun.c:757
+#: tools/symcryptrun.c:728
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: tools/symcryptrun.c:771
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:826
+#: tools/symcryptrun.c:797
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: tools/symcryptrun.c:839
+#: tools/symcryptrun.c:810
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: tools/symcryptrun.c:1014
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1041
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1050
+#: tools/symcryptrun.c:1021
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
diff --git a/po/de.po b/po/de.po
index 654ea5ad0..aa136f1fe 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.0.6\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-09-14 13:27+0200\n"
-"PO-Revision-Date: 2007-09-14 13:31+0200\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
+"PO-Revision-Date: 2007-11-19 16:41+0100\n"
 "Last-Translator: Walter Koch <koch@u32.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "Die Sperre für das Pinentry kann nicht gesetzt werden: %s\n"
 
-#: agent/call-pinentry.c:438
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -31,7 +31,7 @@ msgstr ""
 "Bitte geben Sie Ihre PIN ein, so daß der geheime Schlüssel benutzt werden "
 "kann"
 
-#: agent/call-pinentry.c:441
+#: agent/call-pinentry.c:551
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -39,36 +39,55 @@ msgstr ""
 "Bitte geben Sie Ihre Passphrase ein, so daß der geheime Schlüssel benutzt "
 "werden kann"
 
-#: agent/call-pinentry.c:489
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+msgid "Quality:"
+msgstr "Qualität:"
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+"Die Qualität der Passphrase, die Sie oben eingegeben haben.\n"
+"Bitte fragen sie Ihren Systembeauftragten nach den\n"
+"Kriterien für die Messung der Qualität."
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (Versuch %d von %d)"
 
-#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 msgid "PIN too long"
 msgstr "Die PIN ist zu lang"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:668
 msgid "Passphrase too long"
 msgstr "Das Mantra (Passphrase) ist zu lang"
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:676
 msgid "Invalid characters in PIN"
 msgstr "Ungültige Zeichen in der PIN"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr "Die PIN ist zu kurz"
 
-#: agent/call-pinentry.c:535
+#: agent/call-pinentry.c:693
 msgid "Bad PIN"
 msgstr "Falsche PIN"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:694
 msgid "Bad Passphrase"
 msgstr "Falsche Passphrase"
 
-#: agent/call-pinentry.c:572
+#: agent/call-pinentry.c:730
 msgid "Passphrase"
 msgstr "Passphrase"
 
@@ -77,21 +96,21 @@ msgstr "Passphrase"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "SSH Schlüssel von mehr als %d Bits werden nicht unterstützt\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
-#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1865
-#: sm/gpgsm.c:1902 sm/gpgsm.c:1940 sm/qualified.c:72
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
@@ -131,7 +150,12 @@ msgstr "Fehler beim Schreiben des Schlüssels: %s\n"
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Bitte geben Sie die Passphrase für den SSH-Schlüssel %0A  %c ein"
 
-#: agent/command-ssh.c:2349
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
+msgid "Please re-enter this passphrase"
+msgstr "Bitte geben Sie die Passphrase noch einmal ein:"
+
+#: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
@@ -140,7 +164,12 @@ msgstr ""
 "Bitte geben Sie eine Passphrase ein, um den empfangenen geheimen Schlüssel%%"
 "0A   %s%%0A im Schlüsselspeicher des gpg-agenten zu schützen"
 
-#: agent/command-ssh.c:2850
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
+msgid "does not match - try again"
+msgstr "Keine Übereinstimmung - bitte nochmal versuchen"
+
+#: agent/command-ssh.c:2885
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "Das Erzeugen eines Datenstrom aus dem Socket schlug fehl: %s\n"
@@ -181,14 +210,14 @@ msgstr "Neue Passphrase eingeben"
 msgid "Take this one anyway"
 msgstr "Diese trotzdem benutzen"
 
-#: agent/genkey.c:185
+#: agent/genkey.c:191
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u character long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u characters long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] ""
 "WARNUNG:  Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben.  "
 "Eine Passphrase sollte%%0A mindestens %u Zeichen lang sein."
@@ -196,14 +225,14 @@ msgstr[1] ""
 "WARNUNG:  Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben.  "
 "Eine Passphrase sollte%%0A mindestens %u Zeichen lang sein."
 
-#: agent/genkey.c:202
+#: agent/genkey.c:212
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digit or special character."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digits or special characters."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
 "WARNUNG:  Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben.  "
 "Eine Passphrase sollte%%0Amindestens %u Sonderzeichen oder eine Ziffer "
@@ -213,17 +242,14 @@ msgstr[1] ""
 "Eine Passphrase sollte%%0A mindestens %u Sonderzeichen oder Ziffern "
 "enthalten."
 
-#: agent/genkey.c:225
+#: agent/genkey.c:235
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
-"passphrase may not%0Abe a known term or match certain pattern."
-msgstr ""
-"WARNUNG:  Sie haben eine offensichtlich unsichere%0APassphrase eingegeben.  "
-"Eine Passphrase sollte kein%0Abekanntes Wort sein oder nach bekannten Regeln "
-"aufgebaut sein."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
+msgstr "WARNUNG:  Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben.  Eine Passphrase sollte kein%%0Abekanntes Wort sein oder nach bekannten Regeln aufgebaut sein."
 
-#: agent/genkey.c:238
+#: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
@@ -231,7 +257,7 @@ msgstr ""
 "Sie haben keine Passphrase eingegeben!%0AEine leere Passphrase ist nicht "
 "erlaubt."
 
-#: agent/genkey.c:240
+#: agent/genkey.c:253
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -241,30 +267,21 @@ msgstr ""
 "bestätigen Sie, daß sie auf jeden Schutz Ihres privaten Schlüssels\n"
 "verzichten."
 
-#: agent/genkey.c:246
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr "Ja, ein Schutz ist nicht notwendig"
 
-#: agent/genkey.c:290
+#: agent/genkey.c:306
 #, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr "Bitte geben Sie die Passphrase ein%0Aum Ihren Schlüssel zu schützen"
 
-#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
-msgid "Please re-enter this passphrase"
-msgstr "Bitte geben Sie die Passphrase noch einmal ein:"
-
-#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
-#: tools/symcryptrun.c:456
-msgid "does not match - try again"
-msgstr "Keine Übereinstimmung - bitte nochmal versuchen"
-
-#: agent/genkey.c:412
+#: agent/genkey.c:429
 msgid "Please enter the new passphrase"
 msgstr "Bitte geben Sie die Passphrase ein:"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:104
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 msgid ""
 "@Options:\n"
 " "
@@ -272,63 +289,62 @@ msgstr ""
 "@Optionen:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr "Im Server Modus ausführen"
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:109
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr "Im Daemon Modus ausführen"
 
-#: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:69 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:341
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:112
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr "Ausgabe für /bin/sh"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:113
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr "Ausgabe für /bin/csh"
 
-#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr "Im Vordergrund laufen lassen"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr "Tastatur und Maus nicht \"grabben\""
 
-#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
-#: tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "Logausgaben in eine Datei umlenken"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:134
 msgid "use a standard location for the socket"
 msgstr "Benutze einen Standardnamen für den Socket"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|benutze PGM as PIN-Entry"
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|benutze PGM as SCdaemon"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "do not use the SCdaemon"
 msgstr "Den Scdaemon-basierten Kartenzugriff nicht nutzen"
 
@@ -364,17 +380,17 @@ msgstr "Die ssh-agent-Emulation anschalten"
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|DATEI|Schreibe die Umgebungsvariabeln auf DATEI"
 
-#: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:91 tools/symcryptrun.c:204
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204
 msgid "Please report bugs to <"
 msgstr "Fehlerberichte bitte an <"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Aufruf: gpg-agent [Optionen] (-h für Hilfe)"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -382,130 +398,144 @@ msgstr ""
 "Syntax: gpg-agent [Optionen] [Befehl [Argumente]]\n"
 "Verwaltung von geheimen Schlüsseln für GnuPG\n"
 
-#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ungültige Debugebene `%s' angegeben\n"
 
-#: agent/gpg-agent.c:512 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:340 sm/gpgsm.c:819 sm/gpgsm.c:822 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "Die Bibliothek %s ist nicht aktuell (benötige %s, habe %s)\n"
 
-#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: agent/gpg-agent.c:610 agent/gpg-agent.c:1177 g10/gpg.c:2027
-#: scd/scdaemon.c:421 sm/gpgsm.c:914 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: agent/gpg-agent.c:947 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Fehler beim Erstellen von `%s': %s\n"
 
-#: agent/gpg-agent.c:1247 agent/gpg-agent.c:1373 agent/gpg-agent.c:1377
-#: agent/gpg-agent.c:1418 agent/gpg-agent.c:1422 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:908
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "Verzeichnis `%s' kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr "Der Name des Sockets ist zu lang\n"
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "Socket kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
+#: agent/gpg-agent.c:1321
+#, c-format
+msgid "socket name `%s' is too long\n"
+msgstr "Der Name des Sockets `%s' ist zu lang\n"
+
+#: agent/gpg-agent.c:1333
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "Ein gpg-agent läuft bereits - ein weiterer wird nicht gestartet\n"
 
-#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
+msgid "error getting nonce for the socket\n"
+msgstr "Fehler beim Ermitteln der \"Nonce\" dieses Sockets\n"
+
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "Der Socket kann nicht an `%s' gebunden werden: %s\n"
 
-#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "Der listen()-Aufruf ist fehlgeschlagen: %s\n"
 
-#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "Es wird auf Socket `%s' gehört\n"
 
-#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "Verzeichnis `%s' erzeugt\n"
 
-#: agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1448
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat()-Aufruf für `%s' fehlgeschlagen: %s\n"
 
-#: agent/gpg-agent.c:1438
+#: agent/gpg-agent.c:1452
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "Die Datei `%s' kann nicht als Home-Verzeichnis benutzt werden\n"
 
-#: agent/gpg-agent.c:1549
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
+#, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "Fehler beim Lesen der \"Nonce\" von FD %d: %s\n"
+
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "Handhabungsroutine 0x%lx für fd %d gestartet\n"
 
-#: agent/gpg-agent.c:1554
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "Handhabungsroutine 0x%lx für den fd %d beendet\n"
 
-#: agent/gpg-agent.c:1571
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "SSH-Handhabungsroutine 0x%lx für fd %d gestartet\n"
 
-#: agent/gpg-agent.c:1576
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "SSH-Handhabungsroutine 0x%lx für fd %d beendet\n"
 
-#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
 
-#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s angehalten\n"
 
-#: agent/gpg-agent.c:1809
+#: agent/gpg-agent.c:1850
 msgid "no gpg-agent running in this session\n"
 msgstr "Der gpg-agent läuft nicht für diese Session\n"
 
-#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:756
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
 
-#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
-#: tools/gpg-connect-agent.c:767
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "GPG-Agent-Protokoll-Version %d wird nicht unterstützt\n"
@@ -534,16 +564,16 @@ msgstr ""
 "Syntax: gpg-protect-tool [Optionen] [Argumente]\n"
 "Werkzeug zum Bearbeiten von geheimen Schlüsseln\n"
 
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1188
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Bitte geben Sie die Passphrase zum Entsperren des PKCS#12 Objekts ein"
 
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1191
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 "Bitte geben Sie die Passphrase zum Schützen des neuen PKCS#12 Objekts ein"
 
-#: agent/protect-tool.c:1216
+#: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -551,7 +581,7 @@ msgstr ""
 "Bitte geben Sie die Passphrase ein, um das importierte Objekt im GnuPG "
 "System zu schützen."
 
-#: agent/protect-tool.c:1221
+#: agent/protect-tool.c:1199
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -559,16 +589,16 @@ msgstr ""
 "Die Eingabe der Passphrase bzw. der PIN\n"
 "wird benötigt um diese Aktion auszuführen."
 
-#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "Fehler bei der Abfrage der Passphrase: %s\n"
 
-#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 msgid "cancelled\n"
 msgstr "Vom Benutzer abgebrochen\n"
 
@@ -688,7 +718,8 @@ msgstr "Die Passphrase ändern"
 msgid "I'll change it later"
 msgstr "Ich werde sie später ändern"
 
-#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1338
+#: tools/gpgconf-comp.c:1641
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "Fehler beim Erzeugen einer \"Pipe\": %s\n"
@@ -833,75 +864,79 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr "Kein Speicher mehr vorhanden, als %lu Byte zugewiesen werden sollten"
 
-#: g10/armor.c:366
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII-Hülle: %s\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr "Ungültige ASCII-Hülle"
 
-#: g10/armor.c:416
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr "ASCII-Hülle: "
 
-#: g10/armor.c:427
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr "Ungültige Klartextsignatur-Einleitung\n"
 
-#: g10/armor.c:479
+#: g10/armor.c:455
+msgid "unknown armor header: "
+msgstr "Unbekannter Header in der ASCII-Hülle: "
+
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr "verschachtelte Klartextunterschriften\n"
 
-#: g10/armor.c:614
+#: g10/armor.c:643
 msgid "unexpected armor: "
 msgstr "Unerwartete ASCII-Hülle: "
 
-#: g10/armor.c:626
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr "Ungültige mit Bindestrich \"escapte\" Zeile: "
 
-#: g10/armor.c:780 g10/armor.c:1390
+#: g10/armor.c:809 g10/armor.c:1419
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "Ungültiges \"radix64\" Zeichen %02x übersprungen\n"
 
-#: g10/armor.c:823
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr "vorzeitiges Dateiende (keine Prüfsumme)\n"
 
-#: g10/armor.c:857
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr "vorzeitiges Dateiende (innerhalb der Prüfsumme)\n"
 
-#: g10/armor.c:865
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr "Falsch aufgebaute Prüfsumme\n"
 
-#: g10/armor.c:869 g10/armor.c:1427
+#: g10/armor.c:898 g10/armor.c:1456
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Prüfsummenfehler; %06lx - %06lx\n"
 
-#: g10/armor.c:889
+#: g10/armor.c:918
 msgid "premature eof (in trailer)\n"
 msgstr "vorzeitiges Dateiende (im Nachsatz)\n"
 
-#: g10/armor.c:893
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr "Fehler in der Nachsatzzeile\n"
 
-#: g10/armor.c:1204
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr "Keine gültigen OpenPGP-Daten gefunden.\n"
 
-#: g10/armor.c:1209
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ungültige ASCII-Hülle: Zeile ist länger als %d Zeichen\n"
 
-#: g10/armor.c:1213
+#: g10/armor.c:1242
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1222,11 +1257,11 @@ msgstr "Admin-Befehle sind nicht erlaubt\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/decrypt.c:110 g10/encode.c:890
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Befehl\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht geöffnet werden\n"
@@ -1237,7 +1272,7 @@ msgstr "'%s' kann nicht geöffnet werden\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "Schlüssel \"%s\" nicht gefunden: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1280,7 +1315,7 @@ msgstr ""
 "Verwenden Sie zunächst den Befehl \"--delete-secret-key\", um ihn zu "
 "entfernen.\n"
 
-#: g10/encode.c:226 g10/sign.c:1296
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
@@ -1301,7 +1336,7 @@ msgstr "benutze Cipher %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' ist bereits komprimiert\n"
 
-#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
@@ -1332,7 +1367,7 @@ msgstr ""
 "WARNUNG: Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren %"
 "s (%d) verletzt die Empfängervoreinstellungen\n"
 
-#: g10/encode.c:669 g10/sign.c:966
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1341,19 +1376,19 @@ msgstr ""
 "WARNUNG: Erzwungenes Kompressionsverfahren %s (%d) verletzt die "
 "Empfängervoreinstellungen.\n"
 
-#: g10/encode.c:765
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren %s (%d) "
 "verletzt die Empfängervoreinstellungen\n"
 
-#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/encode.c:862
+#: g10/encode.c:848
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s verschlüsselt für: %s\n"
@@ -1537,7 +1572,7 @@ msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 "Schlüssel %s: geheimer Schlüssel ohne öffentlichen Schlüssel - übersprungen\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1545,132 +1580,132 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/gpg.c:370
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/gpg.c:372 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "Daten verschlüsseln"
 
-#: g10/gpg.c:375 sm/gpgsm.c:248
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschlüsseln"
 
-#: g10/gpg.c:377 sm/gpgsm.c:249
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "Daten entschlüsseln (Voreinstellung)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "Signatur prüfen"
 
-#: g10/gpg.c:381 sm/gpgsm.c:252
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "Liste der Schlüssel"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "Liste der Schlüssel und ihrer Signaturen"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "list and check key signatures"
 msgstr "Signaturen der Schlüssel auflisten und prüfen"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
 
-#: g10/gpg.c:386 sm/gpgsm.c:254
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "Liste der geheimen Schlüssel"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "Ein neues Schlüsselpaar erzeugen"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "remove keys from the public keyring"
 msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "remove keys from the secret keyring"
 msgstr "Schlüssel aus dem geh. Schlüsselbund entfernen"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "Schlüssel signieren"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "Schlüssel nur für diesen Rechner signieren"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "Unterschreiben oder bearbeiten eines Schl."
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "Schlüssel exportieren"
 
-#: g10/gpg.c:397 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "Schlüssel zu einem Schlü.server exportieren"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "Schlüssel von einem Schlü.server importieren"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:402
 msgid "search for keys on a key server"
 msgstr "Schlüssel auf einem Schlü.server suchen"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "update all keys from a keyserver"
 msgstr "alle Schlüssel per Schlü.server aktualisieren"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "Schlüssel importieren/kombinieren"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr "den Karten-Status ausgeben"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr "Daten auf einer Karte ändern"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr "PIN einer Karte ändern"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr "Ändern der \"Trust\"-Datenbank"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests für die Dateien ausgeben"
 
-#: g10/gpg.c:430 sm/gpgsm.c:264
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr "Im Server Modus ausführen"
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1680,47 +1715,48 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:281
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-Hülle versehen"
 
-#: g10/gpg.c:436 sm/gpgsm.c:293
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschlüsseln für NAME"
 
-#: g10/gpg.c:447 sm/gpgsm.c:331
+#: g10/gpg.c:449 sm/gpgsm.c:333
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/gpg.c:448 sm/gpgsm.c:334
+#: g10/gpg.c:450 sm/gpgsm.c:336
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:336
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
-msgid "use as output file"
-msgstr "Als Ausgabedatei benutzen"
+#: g10/gpg.c:469 sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "Keine wirklichen Änderungen durchführen"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "vor Überschreiben nachfragen"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr "OpenPGP-Verhalten strikt beachten"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x-kompatibele Botschaften erzeugen"
 
-#: g10/gpg.c:553 sm/gpgsm.c:397
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1729,7 +1765,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollständige Liste aller Befehle und "
 "Optionen)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:400
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1749,17 +1785,17 @@ msgstr ""
 " --list-keys [Namen]        Schlüssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdrücke\" anzeigen\n"
 
-#: g10/gpg.c:750 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Berichte über Programmfehler bitte in englisch an <gnupg-bugs@gnu.org>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <de@li.org>.\n"
 
-#: g10/gpg.c:767
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h für Hilfe)"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1769,7 +1805,7 @@ msgstr ""
 "Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
 "Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:578
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1777,73 +1813,77 @@ msgstr ""
 "\n"
 "Unterstützte Verfahren:\n"
 
-#: g10/gpg.c:784
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr "Öff.Schlüssel: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Verschlü.: "
 
-#: g10/gpg.c:798
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:805 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Komprimierung: "
 
-#: g10/gpg.c:875
+#: g10/gpg.c:817 sm/gpgsm.c:603
+msgid "Used libraries:"
+msgstr ""
+
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:715
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Befehle\n"
 
-#: g10/gpg.c:1063
+#: g10/gpg.c:1113
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
 
-#: g10/gpg.c:1260
+#: g10/gpg.c:1310
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1263
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1266
+#: g10/gpg.c:1316
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1272
+#: g10/gpg.c:1322
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1325
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1328
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1284
+#: g10/gpg.c:1334
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses für Home-"
 "Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1337
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1851,20 +1891,20 @@ msgstr ""
 "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses der "
 "Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1340
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses `%s'\n"
 
-#: g10/gpg.c:1296
+#: g10/gpg.c:1346
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses des Home-"
 "Verzeichnisses `%s'\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1349
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1872,475 +1912,475 @@ msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
 "Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1352
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses auf "
 "Erweiterung `%s'\n"
 
-#: g10/gpg.c:1445
+#: g10/gpg.c:1495
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Unbekanntes Konfigurationselement `%s'\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr "Anzeigen der Foto-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr "Zeige Richtlinien-URL während der Unterschriftenlisten"
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1594
 msgid "show all notations during signature listings"
 msgstr "Alle Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr "Zeige IETF-Standard"
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr "Zeige anwenderseitige Notationen in den Unterschriftenlisten"
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1602
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "Der bevorzugten Schlüsselserver mit den Signaturen anlisten"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr "Zeige Gültigkeit der User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr "Zeige widerrufene und verfallene User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr "Zeige widerrufene und verfallene Unterschlüssel in den Schlüssellisten"
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1610
 msgid "show the keyring name in key listings"
 msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1612
 msgid "show expiration dates during signature listings"
 msgstr "Das Ablaufdatum mit den Signaturen anlisten"
 
-#: g10/gpg.c:1825
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 "Die Bibliothek \"libgcrypt\" is zu alt (benötigt wird %s, vorhanden ist %s)\n"
 
-#: g10/gpg.c:1981
+#: g10/gpg.c:2030
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
-#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n"
 
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' ist kein gültiges Unterschriftablaufdatum\n"
 
-#: g10/gpg.c:2493
+#: g10/gpg.c:2565
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' ist kein gültiger Zeichensatz\n"
 
-#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
 
-#: g10/gpg.c:2528
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2603
 msgid "invalid keyserver options\n"
 msgstr "Ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2610
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ungültige Import-Option\n"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2613
 msgid "invalid import options\n"
 msgstr "Ungültige Import-Option\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2620
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ungültige Export-Option.\n"
 
-#: g10/gpg.c:2551
+#: g10/gpg.c:2623
 msgid "invalid export options\n"
 msgstr "Ungültige Export-Option\n"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2630
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ungültige Listen-Option.\n"
 
-#: g10/gpg.c:2561
+#: g10/gpg.c:2633
 msgid "invalid list options\n"
 msgstr "Ungültige Listen-Option\n"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr "Zeige die Foto-ID während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr "Zeige Richtlinien-URLs während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2645
 msgid "show all notations during signature verification"
 msgstr "Alle Notationen wahrend der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr "Zeige IETF-Standard-Notationen während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr "Zeie anwenderseitige Notationen während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2653
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "Die URL für den bevorzugten Schlüsselserver während der "
 "Unterschriftenprüfung anzeigen"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2655
 msgid "show user ID validity during signature verification"
 msgstr "Die Gültigkeit der User-ID während der Unterschriftenprüfung anzeigen"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "Zeige widerrufene und verfallene User-IDs während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2659
 msgid "show only the primary user ID in signature verification"
 msgstr "Zeige nur die Hauptuser-ID während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr "Prüfe Unterschriftengültigkeit mittels PKA-Daten"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "werte das Vertrauen zu Unterschriften durch gültige PKA-Daten auf"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2670
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ungültige Überprüfuns-Option.\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2673
 msgid "invalid verify options\n"
 msgstr "Ungültige Überprüfungs-Option\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Der Ausführungspfad konnte nicht auf %s gesetzt werden.\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2855
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr "ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1298
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2975
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "Startet nicht mit unsicherem Speicher, wegen Option %s\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus können Sie nur abgetrennte oder Klartextunterschriften "
 "machen\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus können Sie nicht gleichzeitig unterschreiben und "
 "verschlüsseln\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "Im --pgp2-Modus müssen Sie Dateien benutzen und können keine Pipes "
 "verwenden.\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:3014
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "Verschlüssen einer Botschaft benötigt im --pgp2-Modus die IDEA-"
 "Verschlüsselung\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1370
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1378
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3092
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3098
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed müssen größer als 0 sein\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed müssen größer als 1 sein\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3117
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth muß im Bereich 1 bis 255 liegen\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3119
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ungültiger \"default-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3121
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ungültiger \"min-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ungültiger \"simple S2K\"-Modus; Wert muß 0, 1 oder 3 sein\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3135
 msgid "invalid default preferences\n"
 msgstr "ungültige Standard-Voreinstellungen\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3144
 msgid "invalid personal cipher preferences\n"
 msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3148
 msgid "invalid personal digest preferences\n"
 msgstr "ungültige private Hashvoreinstellungen\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3152
 msgid "invalid personal compress preferences\n"
 msgstr "ungültige private Komprimierungsvoreinstellungen\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3185
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3232
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "Die Benutzung des Verschlüsselungsverfahren %s ist im %s-Modus nicht "
 "erlaubt.\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3237
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Die Benutzung der Hashmethode %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3242
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "Die Benutzung des Komprimierverfahren %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "WARNUNG: Empfänger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3375
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3398
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [Dateiname]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 "--symmetric --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet werden\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Im %s-Modus kann --symmetric --encrypt nicht verwendet werden.\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3449
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "--symmetric --sign --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet "
 "werden\n"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3454
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "Im %s-Modus kann --symmetric --sign --encrypt nicht verwendet werden.\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3474
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3630
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schlüsselexport fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3641
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3651
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4233
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4235
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4268
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
 
@@ -2352,7 +2392,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:75 sm/gpgsm.c:372
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
@@ -2912,13 +2952,13 @@ msgstr "Schlüssel %s: neuer Schlüssel - übersprungen\n"
 msgid "no writable keyring found: %s\n"
 msgstr "kein schreibbarer Schlüsselbund gefunden: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2369 g10/import.c:2391
+#: g10/import.c:2381 g10/import.c:2403
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des Schlüsselbundes `%s': %s\n"
@@ -3009,7 +3049,7 @@ msgstr ""
 msgid "importing secret keys not allowed\n"
 msgstr "Importieren geheimer Schlüssel ist nicht erlaubt\n"
 
-#: g10/import.c:1158 g10/import.c:2384
+#: g10/import.c:1158 g10/import.c:2396
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Kein voreingestellter geheimer Schlüsselbund: %s\n"
@@ -3136,44 +3176,44 @@ msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "Schlüssel %s: unerwartete Unterschriftenklasse (0x%02x) - übersprungen\n"
 
-#: g10/import.c:1732
+#: g10/import.c:1744
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "Schlüssel %s: Doppelte User-ID entdeckt - zusammengeführt\n"
 
-#: g10/import.c:1794
+#: g10/import.c:1806
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "WARNUNG: Schlüssel %s ist u.U. widerrufen: hole Widerrufschlüssel %s\n"
 
-#: g10/import.c:1808
+#: g10/import.c:1820
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "WARNUNG: Schlüssel %s ist u.U. widerrufen: Widerrufschlüssel %s ist nicht "
 "vorhanden\n"
 
-#: g10/import.c:1867
+#: g10/import.c:1879
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat hinzugefügt\n"
 
-#: g10/import.c:1901
+#: g10/import.c:1913
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "Schlüssel %s: \"direct-key\"-Signaturen hinzugefügt\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2302
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 "Hinweis: Eine Schlüsselseriennr stimmt nicht mit derjenigen der Karte "
 "überein\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2310
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "Hinweis: Hauptschlüssel ist online und auf der Karte gespeichert\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2312
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "Hinweis: Zweitschlüssel ist online und auf der Karte gespeichert\n"
 
@@ -3484,7 +3524,7 @@ msgid "Really sign? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
 #: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:348
+#: g10/keyedit.c:5019 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
@@ -3825,8 +3865,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Möchten Sie diesen Schlüssel wirklich widerrufen? "
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "\"Owner trust\" kann nicht gesetzt werden, wenn eine anwendereigene 'Trust'-"
 "Datenbank benutzt wird\n"
@@ -4696,7 +4735,7 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:273
+#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4704,7 +4743,7 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht überein)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:275
+#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5306,17 +5345,17 @@ msgstr "nicht komprimiert"
 msgid "uncompressed|none"
 msgstr "unkomprimiert|kein|keine"
 
-#: g10/misc.c:874
+#: g10/misc.c:891
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "Diese Botschaft könnte für %s unbrauchbar sein\n"
 
-#: g10/misc.c:1049
+#: g10/misc.c:1066
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "Mehrdeutige Option '%s'\n"
 
-#: g10/misc.c:1074
+#: g10/misc.c:1091
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "Unbekannte Option '%s'\n"
@@ -5375,12 +5414,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:603
+#: g10/passphrase.c:295 g10/passphrase.c:581
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (Hauptschlüssel-ID %s)"
 
-#: g10/passphrase.c:327
+#: g10/passphrase.c:309
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5391,24 +5430,24 @@ msgstr ""
 "Benutzer: \"%.*s\"\n"
 "%u-bit %s Schlüssel, ID %s, erzeugt %s%s\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:334
 msgid "Repeat passphrase\n"
 msgstr "Geben Sie die Passphrase nochmal ein\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:336
 msgid "Enter passphrase\n"
 msgstr "Geben Sie die Passphrase ein\n"
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:363
 msgid "cancelled by user\n"
 msgstr "Abbruch durch Benutzer\n"
 
-#: g10/passphrase.c:384 g10/passphrase.c:450
+#: g10/passphrase.c:369 g10/passphrase.c:428
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "Problem mit dem Agenten: %s\n"
 
-#: g10/passphrase.c:582
+#: g10/passphrase.c:560
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5417,12 +5456,12 @@ msgstr ""
 "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu entsperren.\n"
 "Benutzer: \"%s\"\n"
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:568
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-Bit %s Schlüssel, ID %s, erzeugt %s"
 
-#: g10/passphrase.c:599
+#: g10/passphrase.c:577
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (Unterschlüssel aus Hauptschlüssel-ID %s)"
@@ -6073,39 +6112,14 @@ msgstr ""
 "Schlüssel %s: Kein Unterschlüssel für die Unterschlüsselanbindungs-"
 "Beglaubigung\n"
 
-#: g10/sign.c:82
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"Notationen können in einen v3- (PGP 2.x-artigen-) Schlüssel nicht "
-"eingetragen werden\n"
-
-#: g10/sign.c:90
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-"Notationen können in eine v3 (PGP 2.x-artige) Schlüsselunterschrift nicht "
-"eingetragen werden\n"
-
-#: g10/sign.c:104
+#: g10/sign.c:89
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "WARNUNG: \"Notation\" kann nicht %%-erweitert werden (zu groß). Verwende "
 "\"unerweiterte\".\n"
 
-#: g10/sign.c:121
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"Eine Policy URL kann in einen v3 (PGP 2.x-artigen) Schlüssel nicht "
-"eingetragen werden\n"
-
-# translated by wk
-#: g10/sign.c:129
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-"Eine Policy URL kann in einem v3 Schlüssel(PGP 2.x artig) nicht gespeichert "
-"werden\n"
-
-#: g10/sign.c:142
+#: g10/sign.c:115
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6113,7 +6127,7 @@ msgstr ""
 "WARNUNG: Richtlinien-URL kann nicht %%-erweitert werden (zu groß). Verwende "
 "\"unerweiterte\".\n"
 
-#: g10/sign.c:170
+#: g10/sign.c:138
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6122,23 +6136,23 @@ msgstr ""
 "WARNUNG: URL für bevorzugten Schlüsselserver kann nicht %%-erweitert werden "
 "(zu groß). Verwende \"unerweiterte\".\n"
 
-#: g10/sign.c:343
+#: g10/sign.c:311
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Prüfung der erstellten Unterschrift ist fehlgeschlagen: %s\n"
 
-#: g10/sign.c:352
+#: g10/sign.c:320
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s Unterschrift von: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schlüsseln eine abgetrennte "
 "Unterschrift erzeugt werden\n"
 
-#: g10/sign.c:864
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6146,17 +6160,17 @@ msgstr ""
 "WARNUNG: Erzwingen des Hashverfahrens %s (%d) verstößt gegen die "
 "Empfängervoreinstellungen\n"
 
-#: g10/sign.c:991
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "unterschreibe:"
 
-#: g10/sign.c:1106
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus können Sie Klartextunterschriften nur mit PGP-2.x-artigen "
 "Schlüssel machen\n"
 
-#: g10/sign.c:1290
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s Verschlüsselung wird verwendet\n"
@@ -6864,43 +6878,43 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr "Im Multiserver Modus ausführen"
 
-#: scd/scdaemon.c:114 sm/gpgsm.c:361
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 msgid "read options from file"
 msgstr "Konfigurationsoptionen aus Datei lesen"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr "|N|Verbinde mit dem Leser auf Port N"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:122
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|Benutze NAME als CT-API Treiber"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:123
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|Benutze NAME als PC/SC Treiber"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:126
 msgid "do not use the internal CCID driver"
 msgstr "Den internen CCID Treiber nicht benutzen"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr "Die Tastatur des Kartenleser nicht benutzen"
 
-#: scd/scdaemon.c:135
+#: scd/scdaemon.c:132
 msgid "allow the use of admin card commands"
 msgstr "Erlaube die Benutzung von \"Admin\"-Befehlen"
 
-#: scd/scdaemon.c:209
+#: scd/scdaemon.c:210
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Aufruf: scdaemon [Optionen] (-h für Hilfe)"
 
-#: scd/scdaemon.c:211
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6908,18 +6922,18 @@ msgstr ""
 "Synatx: scdaemon [Optionen] [Befehl [Argumente]]\n"
 "Smartcard Daemon für GnuPG\n"
 
-#: scd/scdaemon.c:658
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 "Bitte die Option `--daemon' nutzen um das Programm im Hintergund "
 "auszuführen\n"
 
-#: scd/scdaemon.c:1006
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "Handhabungsroutine für fd %d gestartet\n"
 
-#: scd/scdaemon.c:1011
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "Handhabungsroutine für den fd %d beendet\n"
@@ -6954,11 +6968,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr "Durch Zertifikat angefordertes Gültigkeitsmodell: %s"
 
-#: sm/certchain.c:195 sm/certchain.c:1631
+#: sm/certchain.c:195 sm/certchain.c:1646
 msgid "chain"
 msgstr "Kette"
 
-#: sm/certchain.c:196 sm/certchain.c:1631
+#: sm/certchain.c:196 sm/certchain.c:1646
 msgid "shell"
 msgstr "Schale"
 
@@ -6997,8 +7011,8 @@ msgstr "Der Herausgeber wird von einer externen Stelle gesucht\n"
 msgid "number of issuers matching: %d\n"
 msgstr "Anzahl der übereinstimmenden Heruasgeber: %d\n"
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
 msgid "failed to allocated keyDB handle\n"
 msgstr "Ein keyDB Handle konnte nicht bereitgestellt werden\n"
 
@@ -7164,7 +7178,7 @@ msgstr ""
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "Die Zertifikatkette ist länger als von der CA erlaubt (%d)"
 
-#: sm/certchain.c:1462 sm/certchain.c:1730
+#: sm/certchain.c:1462 sm/certchain.c:1745
 msgid "certificate is good\n"
 msgstr "Das Zertifikat ist korrekt\n"
 
@@ -7176,11 +7190,11 @@ msgstr "Das Zwischenzertifikat ist korrekt\n"
 msgid "root certificate is good\n"
 msgstr "Das Wurzelzertifikat ist korrekt\n"
 
-#: sm/certchain.c:1620
+#: sm/certchain.c:1635
 msgid "switching to chain model"
 msgstr "Umgeschaltet auf das Kettenmodell"
 
-#: sm/certchain.c:1629
+#: sm/certchain.c:1644
 #, c-format
 msgid "validation model used: %s"
 msgstr "Benutztes Gültigkeitsmodell: %s"
@@ -7196,7 +7210,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 "Ein %u-Bit Hashverfahren ist für einen %u-Bit %s Schlüssel nicht möglich\n"
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(Dies ist der MD2 Algorithmus)\n"
 
@@ -7208,23 +7222,23 @@ msgstr "keine"
 msgid "[none]"
 msgstr "[keine]"
 
-#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
+#: sm/certdump.c:583 sm/certdump.c:628 sm/certdump.c:693 sm/certdump.c:746
 msgid "[Error - invalid encoding]"
 msgstr "[Fehler - Ungültige Kodierung]"
 
-#: sm/certdump.c:558 sm/certdump.c:603
+#: sm/certdump.c:591 sm/certdump.c:636
 msgid "[Error - out of core]"
 msgstr "[Fehler - Nicht genügend Speicher]"
 
-#: sm/certdump.c:640 sm/certdump.c:696
+#: sm/certdump.c:673 sm/certdump.c:729
 msgid "[Error - No name]"
 msgstr "[Fehler - Kein Name]"
 
-#: sm/certdump.c:665 sm/certdump.c:719
+#: sm/certdump.c:698 sm/certdump.c:752
 msgid "[Error - invalid DN]"
 msgstr "[Fehler - Ungültiger DN]"
 
-#: sm/certdump.c:936
+#: sm/certdump.c:946
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7355,173 +7369,183 @@ msgstr "Fehler beim Löschen des Zertifikats \"%s\": %s\n"
 msgid "no valid recipients given\n"
 msgstr "Keine gültigen Empfänger angegeben\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:246
 msgid "|[FILE]|make a signature"
 msgstr "|[DATEI]|Erzeuge eine Signatur"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[DATEI]|Erzeuge eine Klartextsignatur"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 msgid "list external keys"
 msgstr "Externe Schlüssel anzeigen"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
 msgid "list certificate chain"
 msgstr "Schlüssel mit Zertifikatekette anzeigen"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:260
 msgid "remove key from the public keyring"
 msgstr "Schlüssel aus dem öffentlichen Schlüsselbund löschen"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 msgid "import certificates"
 msgstr "Zertifikate importieren"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:264
 msgid "export certificates"
 msgstr "Zertifikate exportieren"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "register a smartcard"
 msgstr "Smartcard registrieren"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr "Das Kommand an den Dirmngr durchreichen"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr "Rufe das gpg-protect-tool auf"
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:270
 msgid "change a passphrase"
 msgstr "Die Passphrase ändern"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
 msgid "create base-64 encoded output"
 msgstr "Ausgabe im Basis-64 format erzeugen"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr "Eingabedaten sind im PEM Format"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr "Eingabedaten sind im Basis-64 Format"
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr "Eingabedaten sind im Binärformat"
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
-msgstr "Benutze den System Dirmngr when verfügbar"
+msgstr "Benutze den System Dirmngr falls verfügbar"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr "Niemals eine CRL konsultieren"
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr "Die Gültigkeit mittels OCSP prüfen"
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr "|N|Sende N Zertifikate mit"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr "|DATEI|Richtlinieninformationen DATEI entnehmen"
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr "Zertikikatrichtlinien nicht überprüfen"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr "Fehlende Zertifikate automatisch holen"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|NAME als voreingestellten Empfänger benutzen"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "use the default key as default recipient"
 msgstr ""
 "Den Standardschlüssel als voreingestellten\n"
 "Empfänger benutzen"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:345
+#, fuzzy
+msgid "|FILE|write a server mode log to FILE"
+msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
+
+#: sm/gpgsm.c:347
+#, fuzzy
+msgid "|FILE|write an audit log to FILE"
+msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
+
+#: sm/gpgsm.c:349
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr "Beim Verschlüsseln ein Siegel (MDC) verwenden"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:359
 msgid "add this keyring to the list of keyrings"
 msgstr "Als öffentlichen Schlüsselbund mitbenutzen"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:360
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schlüsselbund mitbenutzen"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|Schlüssel bei diesem Server nachschlagen"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:363
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Terminalzeichensatz NAME benutzen"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NAME|Die Debugstufe auf NAME setzen"
 
-#: sm/gpgsm.c:379
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr "|DATEI|Erweiterungsmodul DATEI laden"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:388
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschlüsselungsverfahren NAME benutzen"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:390
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:392
 msgid "|N|use compress algorithm N"
 msgstr "|N|Komprimierverfahren N benutzen"
 
-#: sm/gpgsm.c:568
+#: sm/gpgsm.c:573
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Aufruf: gpgsm [Optionen] [Dateien] (-h für Hilfe)"
 
-#: sm/gpgsm.c:571
+#: sm/gpgsm.c:576
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7530,35 +7554,35 @@ msgstr ""
 "Syntax: gpgsm [Optionen] [Dateien]\n"
 "Signieren, prüfen, ver- und entschlüsseln mittels S/MIME protocol\n"
 
-#: sm/gpgsm.c:650
+#: sm/gpgsm.c:703
 msgid "usage: gpgsm [options] "
 msgstr "Aufruf: gpgsm [Optionen] "
 
-#: sm/gpgsm.c:748
+#: sm/gpgsm.c:801
 #, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "Hinweis: Verschlüsselung für `%s' wird nicht möglich sein: %s\n"
 
-#: sm/gpgsm.c:759
+#: sm/gpgsm.c:812
 #, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "Unbekanntes Gültigkeitsmodell '%s'\n"
 
-#: sm/gpgsm.c:1315
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
 
-#: sm/gpgsm.c:1411
+#: sm/gpgsm.c:1468
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "Importiere allgemeine Zertifikate: %s\n"
 
-#: sm/gpgsm.c:1429
+#: sm/gpgsm.c:1486
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "Signieren mit `%s' nicht möglich: %s\n"
 
-#: sm/gpgsm.c:1612
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr "Dieser Befehl wurde noch nicht implementiert\n"
 
@@ -7580,7 +7604,7 @@ msgstr "Grundlegende Zertifikatprüfungen fehlgeschlagen - nicht importiert\n"
 msgid "error importing certificate: %s\n"
 msgstr "Fehler beim Importieren des Zertifikats: %s\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:1274
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "Fehler beim Lesen der Eingabe: %s\n"
@@ -7643,17 +7667,17 @@ msgstr ""
 "GPG_TTY wurde nicht gesetzt - ein (möglicherweise falscher) Standardwert "
 "wird deshalb verwendet\n"
 
-#: sm/qualified.c:111
+#: sm/qualified.c:105
 #, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "Der Fingerabdruck in `%s', Zeile %d is fehlerhaft formatiert\n"
 
-#: sm/qualified.c:129
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr "Ungültiger Landescode in `%s', Zeile %d\n"
 
-#: sm/qualified.c:225
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7670,7 +7694,7 @@ msgstr ""
 "\n"
 "%s%sSind Sie wirklich sicher, daß Sie dies möchten?"
 
-#: sm/qualified.c:234 sm/verify.c:536
+#: sm/qualified.c:209 sm/verify.c:580
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7678,7 +7702,7 @@ msgstr ""
 "Bitte beachten Sie, daß diese Software nicht offiziell zur Erzeugung\n"
 "oder Prüfung von qualifizierten Signaturen zugelassen ist.\n"
 
-#: sm/qualified.c:327
+#: sm/qualified.c:277
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7695,60 +7719,69 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Prüfung auf ein qualifiziertes Zertifikats fehlgeschlagen: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:424
 msgid "Signature made "
 msgstr "Signatur erzeugt am "
 
-#: sm/verify.c:392
+#: sm/verify.c:428
 msgid "[date not given]"
 msgstr "[Datum nicht vorhanden]"
 
-#: sm/verify.c:393
+#: sm/verify.c:429
 #, c-format
 msgid " using certificate ID 0x%08lX\n"
-msgstr "mittels Zertifikat ID 0x%08lX\n"
+msgstr " mittels Zertifikat ID 0x%08lX\n"
 
-#: sm/verify.c:514
+#: sm/verify.c:558
 msgid "Good signature from"
 msgstr "Korrekte Signatur von"
 
-#: sm/verify.c:515
+#: sm/verify.c:559
 msgid "                aka"
 msgstr "                alias"
 
-#: sm/verify.c:533
+#: sm/verify.c:577
 msgid "This is a qualified signature\n"
 msgstr "Dies ist eine qualifizierte Unterschrift.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
 msgid "quiet"
 msgstr "Weniger Ausgaben"
 
-#: tools/gpg-connect-agent.c:60
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr "Druckdaten hexkodiert ausgeben"
 
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr "Dekodiere empfangene Datenzeilen"
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|Verbinde mit dem Assuan-Socket NAME"
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr "Starten des auf der Kommandozeile angegebenen Assuan-Server"
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr "Den \"extended connect\"-Modus nicht nutzen"
 
-#: tools/gpg-connect-agent.c:127
+#: tools/gpg-connect-agent.c:74
+#, fuzzy
+msgid "|FILE|run commands from FILE on startup"
+msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
+
+#: tools/gpg-connect-agent.c:75
+msgid "run /subst on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:174
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Aufruf: gpg-connect-agent [Optionen] (-h für Hilfe)"
 
-#: tools/gpg-connect-agent.c:130
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -7756,198 +7789,207 @@ msgstr ""
 "Syntax: gpg-connect-agent [Optionen]\n"
 "Mit einem laufenden Agenten verbinden und Befehle senden\n"
 
-#: tools/gpg-connect-agent.c:314
+#: tools/gpg-connect-agent.c:1155
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "Option \"%s\" erfordert ein Programm und evtl. Argumente\n"
 
-#: tools/gpg-connect-agent.c:323
+#: tools/gpg-connect-agent.c:1164
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "Option \"%s\" wird wegen \"%s\" nicht beachtet\n"
 
-#: tools/gpg-connect-agent.c:381
+#: tools/gpg-connect-agent.c:1219 tools/gpg-connect-agent.c:1645
+#, c-format
+msgid "receiving line failed: %s\n"
+msgstr "Empfangen der Zeile schlug fehl: %s\n"
+
+#: tools/gpg-connect-agent.c:1299
 msgid "line too long - skipped\n"
 msgstr "Zeile zu lang - übersprungen\n"
 
-#: tools/gpg-connect-agent.c:385
+#: tools/gpg-connect-agent.c:1303
 msgid "line shortened due to embedded Nul character\n"
 msgstr "Zeile wegen enthaltenem Nul-Zeichen gekürzt\n"
 
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:1619
 #, c-format
 msgid "unknown command `%s'\n"
 msgstr "unbekannter Befehl `%s'\n"
 
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:1637
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "Senden der Zeile schlug fehl: %s\n"
 
-#: tools/gpg-connect-agent.c:473
-#, c-format
-msgid "receiving line failed: %s\n"
-msgstr "Empfangen der Zeile schlug fehl: %s\n"
-
-#: tools/gpg-connect-agent.c:789
+#: tools/gpg-connect-agent.c:1986
 #, c-format
 msgid "error sending %s command: %s\n"
 msgstr "Fehler beim Senden des %s-Befehls: %s\n"
 
-#: tools/gpg-connect-agent.c:798
+#: tools/gpg-connect-agent.c:1995
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "Fehler beim Senden der Standardoptionen: %s\n"
 
-#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
-#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
+#: tools/gpgconf-comp.c:459 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:773
 msgid "Options controlling the diagnostic output"
 msgstr "Optionen zur Einstellung Diagnoseausgaben"
 
-#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:796
 msgid "Options controlling the configuration"
 msgstr "Optionen zur Einstellung der Konfiguration"
 
-#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
-#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
+#: tools/gpgconf-comp.c:482 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:803
 msgid "Options useful for debugging"
 msgstr "Nützliche Optionen zum Debuggen"
 
-#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
-#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:487 tools/gpgconf-comp.c:606 tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:729 tools/gpgconf-comp.c:811
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
 
-#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:737
 msgid "Options controlling the security"
 msgstr "Optionen zur Einstellung der Sicherheit"
 
-#: tools/gpgconf-comp.c:504
+#: tools/gpgconf-comp.c:502
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|lasse SSH Schlüssel im Cache nach N Sekunden verfallen"
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:506
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|setze die maximale Lebensdauer von PINs im Cache auf N Sekunden"
 
-#: tools/gpgconf-comp.c:512
+#: tools/gpgconf-comp.c:510
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|setze die maximale Lebenszeit von SSH Schlüsseln auf N Sekunden"
 
-#: tools/gpgconf-comp.c:526
+#: tools/gpgconf-comp.c:524
 msgid "Options enforcing a passphrase policy"
 msgstr "Optionen für eien Passphrase-Policy"
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:527
 msgid "do not allow to bypass the passphrase policy"
 msgstr "Einhaltung der Passphrase-Policy erzwingen"
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:531
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|setze die kleinste erlaubte Länge von Passphrasen auf N"
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:535
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|Verlange mindestens N Nicht-Buchstaben für eine neue Passphrase"
 
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:539
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|DATEI|Prüfe neue Passphrases gegen die Regelen in DATEI"
 
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:543
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|Lasse die Passphrase nach N Tagen verfallen"
 
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:547
 msgid "do not allow the reuse of old passphrases"
 msgstr "Verbiete die Wiedernutzung alter Passphrases."
 
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:710
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|Auf an NAME verschlüsseln"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:669
 msgid "Configuration for Keyservers"
 msgstr "Konfiguration der Schlüsselserver"
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:671
 msgid "|URL|use keyserver at URL"
 msgstr "Benutze Schlüsselserver unter der URL"
 
-#: tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:674
 msgid "allow PKA lookups (DNS requests)"
 msgstr "Erlaube PKA Zugriffe (DNS Anfragen)"
 
-#: tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:719
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|Benutze die Kodierung NAME für PKCS#12 Passphrasen"
 
-#: tools/gpgconf-comp.c:744
+#: tools/gpgconf-comp.c:742
 msgid "do not check CRLs for root certificates"
 msgstr "CRL bei Wurzelzertifikaten nicht überprüfen"
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:786
 msgid "Options controlling the format of the output"
 msgstr "Optionen zum Einstellen der Ausgabeformate"
 
-#: tools/gpgconf-comp.c:824
+#: tools/gpgconf-comp.c:822
 msgid "Options controlling the interactivity and enforcement"
 msgstr "Optionen zur Einstellung der Interaktivität und Geltendmachung"
 
-#: tools/gpgconf-comp.c:834
+#: tools/gpgconf-comp.c:832
 msgid "Configuration for HTTP servers"
 msgstr "Konfiguration für HTTP Server"
 
-#: tools/gpgconf-comp.c:845
+#: tools/gpgconf-comp.c:843
 msgid "use system's HTTP proxy setting"
 msgstr "Benutze die HTTP Proxy Einstellung des Systems"
 
-#: tools/gpgconf-comp.c:850
+#: tools/gpgconf-comp.c:848
 msgid "Configuration of LDAP servers to use"
 msgstr "Konfiguration der zu nutzenden LDAP-Server"
 
-#: tools/gpgconf-comp.c:887
+#: tools/gpgconf-comp.c:885
 msgid "Configuration for OCSP"
 msgstr "Konfiguration zu OCSP"
 
-#: tools/gpgconf-comp.c:2982
+#: tools/gpgconf-comp.c:3006
 msgid "Note that group specifications are ignored\n"
 msgstr "Beachten Sie, daß Gruppenspezifiaktionen ignoriert werden\n"
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
 msgid "list all components"
 msgstr "Liste aller Komponenten"
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:59
 msgid "check all programs"
 msgstr "Prüfe alle Programme"
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|list options"
 msgstr "|KOMPONENTE|Zeige die Optionen an"
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "|COMPONENT|change options"
 msgstr "|KOMPONENTE|Ändere die Optionen"
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "apply global default values"
 msgstr "Wende die gobalen Voreinstellungen an"
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
+#, fuzzy
+msgid "list global configuration file"
+msgstr "Prüfe die globale Konfigurationsdatei"
+
+#: tools/gpgconf.c:67
 msgid "check global configuration file"
 msgstr "Prüfe die globale Konfigurationsdatei"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:71
+msgid "use as output file"
+msgstr "Als Ausgabedatei benutzen"
+
+#: tools/gpgconf.c:75
 msgid "activate changes at runtime, if possible"
 msgstr "Aktiviere Änderungen zur Laufzeit; falls möglich"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Aufruf: gpgconf [Optionen] (-h für Hilfe)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:100
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
@@ -7955,19 +7997,19 @@ msgstr ""
 "Syntax: gpgconf {Optionen]\n"
 "Verwalte Konfigurationsoptionen für Programme des GnuPG Systems\n"
 
-#: tools/gpgconf.c:176 tools/gpgconf.c:209
+#: tools/gpgconf.c:202 tools/gpgconf.c:240
 msgid "usage: gpgconf [options] "
 msgstr "Aufruf: gpgconf [Optionen] "
 
-#: tools/gpgconf.c:178
+#: tools/gpgconf.c:204
 msgid "Need one component argument"
 msgstr "Benötige ein Komponentenargument"
 
-#: tools/gpgconf.c:187
+#: tools/gpgconf.c:213
 msgid "Component not found"
 msgstr "Komponente nicht gefunden"
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:242
 msgid "No argument allowed"
 msgstr "Argumente sind nicht erlaubt"
 
@@ -8059,91 +8101,112 @@ msgstr "Fehler beim Lesen von %s: %s\n"
 msgid "error closing %s: %s\n"
 msgstr "Fehler beim Schliessen von %s: %s\n"
 
-#: tools/symcryptrun.c:515
+#: tools/symcryptrun.c:486
 msgid "no --program option provided\n"
 msgstr "Option --programm nicht angegeben\n"
 
-#: tools/symcryptrun.c:521
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr "nur --decrypt und --encrypt sind vorhanden\n"
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr "keine --keyfile -Option angegeben\n"
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr "Kann \"args-vector\" nicht zuteilen\n"
 
-#: tools/symcryptrun.c:556
+#: tools/symcryptrun.c:527
 #, c-format
 msgid "could not create pipe: %s\n"
 msgstr "Pipe kann nicht erzeugt werden: %s\n"
 
-#: tools/symcryptrun.c:563
+#: tools/symcryptrun.c:534
 #, c-format
 msgid "could not create pty: %s\n"
 msgstr "Pty kann nicht erzeugt werden: %s\n"
 
-#: tools/symcryptrun.c:579
+#: tools/symcryptrun.c:550
 #, c-format
 msgid "could not fork: %s\n"
 msgstr "Kann nicht fork()en: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:578
 #, c-format
 msgid "execv failed: %s\n"
 msgstr "Der execv()-Aufruf ist fehlgeschlagen: %s\n"
 
-#: tools/symcryptrun.c:636
+#: tools/symcryptrun.c:607
 #, c-format
 msgid "select failed: %s\n"
 msgstr "Der select()-Aufruf ist fehlgeschlagen: %s\n"
 
-#: tools/symcryptrun.c:653
+#: tools/symcryptrun.c:624
 #, c-format
 msgid "read failed: %s\n"
 msgstr "Lesen schlug fehl: %s\n"
 
-#: tools/symcryptrun.c:705
+#: tools/symcryptrun.c:676
 #, c-format
 msgid "pty read failed: %s\n"
 msgstr "\"pty read\"-Aufruf ist fehlgeschlagen: %s\n"
 
-#: tools/symcryptrun.c:757
+#: tools/symcryptrun.c:728
 #, c-format
 msgid "waitpid failed: %s\n"
 msgstr "Der waitpid()-Aufruf ist fehlgeschlagen: %s\n"
 
-#: tools/symcryptrun.c:771
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr "Kind brach mit Status %i ab\n"
 
-#: tools/symcryptrun.c:826
+#: tools/symcryptrun.c:797
 #, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "Kann In-Datei-Zeichenkette keinen Speicher zuteilen: %s\n"
 
-#: tools/symcryptrun.c:839
+#: tools/symcryptrun.c:810
 #, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "Kann Out-Datei-Zeichenkette keinen Speicher zuteilen: %s\n"
 
-#: tools/symcryptrun.c:1014
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr "entweder %s oder %s muß angegeben sein\n"
 
-#: tools/symcryptrun.c:1041
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr "keine Klasse angegeben\n"
 
-#: tools/symcryptrun.c:1050
+#: tools/symcryptrun.c:1021
 #, c-format
 msgid "class %s is not supported\n"
 msgstr "Klasse %s wird nicht unterstützt\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "Notationen können in einen v3- (PGP 2.x-artigen-) Schlüssel nicht "
+#~ "eingetragen werden\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "Notationen können in eine v3 (PGP 2.x-artige) Schlüsselunterschrift nicht "
+#~ "eingetragen werden\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "Eine Policy URL kann in einen v3 (PGP 2.x-artigen) Schlüssel nicht "
+#~ "eingetragen werden\n"
+
+# translated by wk
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "Eine Policy URL kann in einem v3 Schlüssel(PGP 2.x artig) nicht "
+#~ "gespeichert werden\n"
+
 #, fuzzy
 #~ msgid "shelll"
 #~ msgstr "Schale"
diff --git a/po/el.po b/po/el.po
index fb974fdd0..bf974f4d6 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-09-14 13:27+0200\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
 "PO-Revision-Date: 2003-06-27 12:00+0200\n"
 "Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -14,59 +14,75 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: agent/call-pinentry.c:438
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:441
+#: agent/call-pinentry.c:551
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/call-pinentry.c:489
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+msgid "Quality:"
+msgstr ""
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 #, fuzzy
 msgid "PIN too long"
 msgstr "� ������ ����� ���� ������\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:668
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "� ����� ������ ����� ���� ������\n"
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:676
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "�� ������� ���������� ��� �����\n"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:535
+#: agent/call-pinentry.c:693
 #, fuzzy
 msgid "Bad PIN"
 msgstr "���� MPI"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:694
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "���� ����� ������"
 
-#: agent/call-pinentry.c:572
+#: agent/call-pinentry.c:730
 #, fuzzy
 msgid "Passphrase"
 msgstr "���� ����� ������"
@@ -76,21 +92,21 @@ msgstr "���� ����� ������"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
-#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1865
-#: sm/gpgsm.c:1902 sm/gpgsm.c:1940 sm/qualified.c:72
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
@@ -130,14 +146,25 @@ msgstr "�������� �������� ��� ����������� `%s': %s\n"
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/command-ssh.c:2349
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "������ ��� ������ ������"
+
+#: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2850
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/command-ssh.c:2885
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: �������� ����������� hashtable: %s\n"
@@ -182,76 +209,66 @@ msgstr "�������������� �� ����� ������\n"
 msgid "Take this one anyway"
 msgstr "����� ���������� ����� ��� ��������; "
 
-#: agent/genkey.c:185
+#: agent/genkey.c:191
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u character long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u characters long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:202
+#: agent/genkey.c:212
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digit or special character."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digits or special characters."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:225
+#: agent/genkey.c:235
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
-"passphrase may not%0Abe a known term or match certain pattern."
+"Warning: You have entered an insecure passphrase.%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:238
+#: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:240
+#: agent/genkey.c:253
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:246
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:290
+#: agent/genkey.c:306
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
 "\n"
 
-#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "������ ��� ������ ������"
-
-#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
-#: tools/symcryptrun.c:456
-msgid "does not match - try again"
-msgstr ""
-
-#: agent/genkey.c:412
+#: agent/genkey.c:429
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "������ ��� ������ ������"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:104
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -261,67 +278,66 @@ msgstr ""
 "��������:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:109
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:69 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "���������"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:341
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "����� ������"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:112
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:113
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|������|������� ��� ���������� ��������� ������"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
-#: tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "��������� �������� �� ��� ���������� ��������"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:134
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "�������� ��� ����� ��������� ������������"
@@ -359,150 +375,165 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:91 tools/symcryptrun.c:204
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "��������� �� ���������� ��� <gnupg-bugs@gnu.org>\n"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:512 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:340 sm/gpgsm.c:819 sm/gpgsm.c:822 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: agent/gpg-agent.c:610 agent/gpg-agent.c:1177 g10/gpg.c:2027
-#: scd/scdaemon.c:421 sm/gpgsm.c:914 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: agent/gpg-agent.c:947 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "������ ���� �� ���������� ��� `%s': %s\n"
 
-#: agent/gpg-agent.c:1247 agent/gpg-agent.c:1373 agent/gpg-agent.c:1377
-#: agent/gpg-agent.c:1418 agent/gpg-agent.c:1422 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:908
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�������� ����������� ��������� `%s': %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
+#: agent/gpg-agent.c:1321
+#, c-format
+msgid "socket name `%s' is too long\n"
+msgstr ""
+
+#: agent/gpg-agent.c:1333
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
+#, fuzzy
+msgid "error getting nonce for the socket\n"
+msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "������ ��� �������� ���� �� `%s': %s\n"
 
-#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: ��������� �������������\n"
 
-#: agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1448
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1438
+#: agent/gpg-agent.c:1452
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: �������� ����������� ���������: %s\n"
 
-#: agent/gpg-agent.c:1549
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
+#, fuzzy, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1554
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1571
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1576
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ������������: %s\n"
 
-#: agent/gpg-agent.c:1809
+#: agent/gpg-agent.c:1850
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:756
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "��������������� ��������� ������������� GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
-#: tools/gpg-connect-agent.c:767
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
@@ -529,40 +560,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1188
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1191
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/protect-tool.c:1216
+#: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1221
+#: agent/protect-tool.c:1199
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "���� ����� ������"
 
-#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "�������"
@@ -674,7 +705,8 @@ msgstr "������ ��� ������ ������"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1338
+#: tools/gpgconf-comp.c:1641
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
@@ -823,77 +855,82 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:366
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr "��������: %s\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr "�� ������ ����������� ���������: "
 
-#: g10/armor.c:416
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr "����������� ���������: "
 
-#: g10/armor.c:427
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr "�� ������ ����������� clearsig\n"
 
-#: g10/armor.c:479
+#: g10/armor.c:455
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "����������� ���������: "
+
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr "����������� �� ���������������� ���������\n"
 
-#: g10/armor.c:614
+#: g10/armor.c:643
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "�� ����������� ��������:"
 
-#: g10/armor.c:626
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr "�� ������ dash escaped ������: "
 
-#: g10/armor.c:780 g10/armor.c:1390
+#: g10/armor.c:809 g10/armor.c:1419
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "�� ������� radix64 ���������� %02x ���������\n"
 
-#: g10/armor.c:823
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr "������ ����� ������� (������� CRC)\n"
 
-#: g10/armor.c:857
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr "������ ����� ������� (����� CRC)\n"
 
-#: g10/armor.c:865
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr "����� ����� CRC\n"
 
-#: g10/armor.c:869 g10/armor.c:1427
+#: g10/armor.c:898 g10/armor.c:1456
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "������ CRC: %06lx - %06lx\n"
 
-#: g10/armor.c:889
+#: g10/armor.c:918
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "������ ����� ������� (��� �railer)\n"
 
-#: g10/armor.c:893
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr "������ ��� ������ trailer\n"
 
-#: g10/armor.c:1204
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: g10/armor.c:1209
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "�� ������ ��������: � ������ ����� ���� ��� %d ����������\n"
 
-#: g10/armor.c:1213
+#: g10/armor.c:1242
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1239,11 +1276,11 @@ msgstr "������� ��� �������� �������� ��� `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�� ������ ������  (��������� \"help\")\n"
 
-#: g10/decrypt.c:110 g10/encode.c:890
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "�������� ��������� ��� `%s'\n"
@@ -1254,7 +1291,7 @@ msgstr "�������� ��������� ��� `%s'\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1298,7 +1335,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "��������������� ����� ��� ������� \"--delete-secret-key\" ��� �������� ���.\n"
 
-#: g10/encode.c:226 g10/sign.c:1296
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
@@ -1317,7 +1354,7 @@ msgstr "����� ��� ���������������: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' ��� �����������\n"
 
-#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�������������: `%s' ����� ��� ����� ������\n"
@@ -1348,7 +1385,7 @@ msgstr ""
 "� ������������ ����������� ���������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:669 g10/sign.c:966
+#: g10/encode.c:655 g10/sign.c:936
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1357,19 +1394,19 @@ msgstr ""
 "� ������������ ������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:765
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "� ������������ ����������� ���������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/encode.c:862
+#: g10/encode.c:848
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s ��������������� ���: \"%s\"\n"
@@ -1560,7 +1597,7 @@ msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1568,133 +1605,133 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: g10/gpg.c:370
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[������]|���������� ���� ���������"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[������]|���������� ���� �� ���������������� ���������"
 
-#: g10/gpg.c:372 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "���������� ���� �� ������������� ���������"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "������������� ���������"
 
-#: g10/gpg.c:375 sm/gpgsm.c:248
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr "������������� �� ����� ���� ����������� ����������"
 
-#: g10/gpg.c:377 sm/gpgsm.c:249
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "���������������� ��������� (��������������)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "���������� ���� ���������"
 
-#: g10/gpg.c:381 sm/gpgsm.c:252
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "���������� ��� ������ ��������"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "���������� ��� ������ �������� ��� ���������"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "������� ��������� ��������"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
 
-#: g10/gpg.c:386 sm/gpgsm.c:254
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "���������� ��� ������ �������� ��������"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "remove keys from the public keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "remove keys from the secret keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "�������� ���� ��������"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "�������� ���� �������� ������"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "�������� � ����������� ���� ��������"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "���������� ���� �������������� ���������"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "������� ��������"
 
-#: g10/gpg.c:397 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "������� �������� �� ��� ���������� ��������"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "�������� �������� ��� ��� ���������� ��������"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:402
 msgid "search for keys on a key server"
 msgstr "��������� �������� �� ��� ���������� ��������"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "update all keys from a keyserver"
 msgstr "�������� ���� ��� �������� ��� ��� ���������� ��������"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "��������/���������� ��������"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:410
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr "�������� ��� ����� ��������� ������������"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr "|����� [������]| ���������� ���������� ��� ���������"
 
-#: g10/gpg.c:430 sm/gpgsm.c:264
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1704,47 +1741,48 @@ msgstr ""
 "��������:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:281
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr "���������� ascii ������������ ������"
 
-#: g10/gpg.c:436 sm/gpgsm.c:293
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|�����|������������� ��� �����"
 
-#: g10/gpg.c:447 sm/gpgsm.c:331
+#: g10/gpg.c:449 sm/gpgsm.c:333
 msgid "use this user-id to sign or decrypt"
 msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
 
-#: g10/gpg.c:448 sm/gpgsm.c:334
+#: g10/gpg.c:450 sm/gpgsm.c:336
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���������� �������� ��������� N (0 �������������)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:336
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr "����� ��������� ���������� ��������"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
-msgid "use as output file"
-msgstr "����� �� ������� ������"
+#: g10/gpg.c:469 sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "|������|������� ��� ���������� ��������� ������"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "�� �� ����� ������ ������"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "������� ���� ��� ���������"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:524
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:397
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1752,7 +1790,7 @@ msgstr ""
 "@\n"
 "(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:400
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1772,15 +1810,15 @@ msgstr ""
 " --list-keys [�������]        ���������� ��������\n"
 " --fingerprint [�������]      ���������� ������������ (fingerprints)\n"
 
-#: g10/gpg.c:750 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "��������� �� ���������� ��� <gnupg-bugs@gnu.org>\n"
 
-#: g10/gpg.c:767
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1790,7 +1828,7 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:578
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1798,568 +1836,572 @@ msgstr ""
 "\n"
 "��������������� ����������:\n"
 
-#: g10/gpg.c:784
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr "�����������:"
 
-#: g10/gpg.c:791 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "���������������: "
 
-#: g10/gpg.c:798
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:805 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "��������: "
 
-#: g10/gpg.c:875
+#: g10/gpg.c:817 sm/gpgsm.c:603
+msgid "Used libraries:"
+msgstr ""
+
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "�����: gpg [��������] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:715
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "������������� �������\n"
 
-#: g10/gpg.c:1063
+#: g10/gpg.c:1113
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
 
-#: g10/gpg.c:1260
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1263
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1266
+#: g10/gpg.c:1316
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1272
+#: g10/gpg.c:1322
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1325
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1328
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1284
+#: g10/gpg.c:1334
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1337
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1340
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1296
+#: g10/gpg.c:1346
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1349
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1352
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1445
+#: g10/gpg.c:1495
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1594
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1602
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1610
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1612
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1825
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1981
+#: g10/gpg.c:2030
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
 
-#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
 
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2493
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/gpg.c:2528
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2610
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2613
 msgid "invalid import options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2620
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2551
+#: g10/gpg.c:2623
 msgid "invalid export options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2630
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2561
+#: g10/gpg.c:2633
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2645
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2653
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2655
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2659
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2670
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2673
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�������� ������� ��� exec-path �� %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2855
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1298
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�������������: �� %s ����������� �� %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2975
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
 "���������\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:3014
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1370
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1378
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3092
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3098
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "� ����������� ���������� ��������� ��� �����������\n"
 "��� ����� �������\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3117
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ������ �� ����� ������ 1 ��� 255\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3119
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�� ������ default-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3121
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3135
 msgid "invalid default preferences\n"
 msgstr "�� ������� �����������\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3144
 msgid "invalid personal cipher preferences\n"
 msgstr "�� ������� ����������� ���������� ���������������\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3148
 msgid "invalid personal digest preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3152
 msgid "invalid personal compress preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3185
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3232
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3237
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3242
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3375
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3403
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3449
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3454
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3474
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3630
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "������� �������� �������: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3641
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver ��������� �������: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3651
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4233
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4235
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4268
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
@@ -2372,7 +2414,7 @@ msgstr "������� ��� �������� ��� ���� �� ����������"
 msgid "make timestamp conflicts only a warning"
 msgstr "������� ��� ����������� ���� (timestamp) ���� ��� �������������"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:372
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr "|FD|������� ��� ����������� ���������� ��� FD"
 
@@ -2908,13 +2950,13 @@ msgstr "������ %08lX:  ��� ������ - ������������\n"
 msgid "no writable keyring found: %s\n"
 msgstr "��� ������� ��������� ����������: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������� ���  `%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2369 g10/import.c:2391
+#: g10/import.c:2381 g10/import.c:2403
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "�������� �������� ��� ����������� `%s': %s\n"
@@ -3004,7 +3046,7 @@ msgstr "������ %08lX: ������� ������ �� ����� ��������. %d - ������������\n"
 msgid "importing secret keys not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/import.c:1158 g10/import.c:2384
+#: g10/import.c:1158 g10/import.c:2396
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "��� ������� �������������� ����������: %s\n"
@@ -3130,46 +3172,46 @@ msgstr ""
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "������ %08lX: �� ����������� ����� ��������� (0x%02x) - ������������\n"
 
-#: g10/import.c:1732
+#: g10/import.c:1744
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "������ %08lX: ����������� ����� user ID - ��������\n"
 
-#: g10/import.c:1794
+#: g10/import.c:1806
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: ���� �������� ��������� %"
 "08lX\n"
 
-#: g10/import.c:1808
+#: g10/import.c:1820
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: �� ������ ��������� %08lX\n"
 "��� ����� �����.\n"
 
-#: g10/import.c:1867
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ����������\n"
 
-#: g10/import.c:1901
+#: g10/import.c:1913
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "������ %08lX: ����� �������� �������� ����������\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2302
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "�� ������� ������ ��� ��������� �� �� �������!\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2310
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2312
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "������������: ������� ������ ��� �����\n"
@@ -3499,7 +3541,7 @@ msgid "Really sign? (y/N) "
 msgstr "������� �� ���������; "
 
 #: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:348
+#: g10/keyedit.c:5019 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "� �������� �������: %s\n"
@@ -3863,8 +3905,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
 #: g10/keyedit.c:2140
@@ -4756,7 +4797,7 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:273
+#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4764,7 +4805,7 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:275
+#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5371,17 +5412,17 @@ msgstr "����������"
 msgid "uncompressed|none"
 msgstr "����������"
 
-#: g10/misc.c:874
+#: g10/misc.c:891
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "���� �� ������ ���� ��� ������ �� �������������� ��� %s\n"
 
-#: g10/misc.c:1049
+#: g10/misc.c:1066
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/misc.c:1074
+#: g10/misc.c:1091
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
@@ -5439,12 +5480,12 @@ msgstr "�������������: ������� �� ������� ��������������� ���������� ������\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��������� ����� %d ���� �������� �� ������� bit\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:603
+#: g10/passphrase.c:295 g10/passphrase.c:581
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (����� ������, ID %08lX)"
 
-#: g10/passphrase.c:327
+#: g10/passphrase.c:309
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5456,24 +5497,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s ������, ID %08lX, ���������� %s%s\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:334
 msgid "Repeat passphrase\n"
 msgstr "����������� �� �����\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:336
 msgid "Enter passphrase\n"
 msgstr "�������������� �� ����� ������\n"
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:363
 msgid "cancelled by user\n"
 msgstr "��������� ��� �� ������\n"
 
-#: g10/passphrase.c:384 g10/passphrase.c:450
+#: g10/passphrase.c:369 g10/passphrase.c:428
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
 
-#: g10/passphrase.c:582
+#: g10/passphrase.c:560
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5483,12 +5524,12 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������ �� ������� ������\n"
 "��� �� ������: \""
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:568
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit %s ������, ID %08lX, ���������� %s"
 
-#: g10/passphrase.c:599
+#: g10/passphrase.c:577
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6134,34 +6175,14 @@ msgstr "������ %08lX: ������ ��������� ��� �� ������ ��������� �����������\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� �����������\n"
 
-#: g10/sign.c:82
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"�������� ����������� ��������� �������� �� ��������� v3 (PGP 2.x ����)\n"
-
-#: g10/sign.c:90
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-"�������� ����������� ��������� �������� �� ��������� �������� v3 (PGP 2.x "
-"����)\n"
-
-#: g10/sign.c:104
+#: g10/sign.c:89
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "�������������: �������� ���� %%-�������� ��������� (���� ������).\n"
 "               ����� �� ������������.\n"
 
-#: g10/sign.c:121
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "�������� ����������� URL ��������� �� ��������� v3 (PGP 2.x ����)\n"
-
-#: g10/sign.c:129
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-"�������� ����������� URL ��������� �� ��������� �������� v3 (PGP 2.x ����)\n"
-
-#: g10/sign.c:142
+#: g10/sign.c:115
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6169,7 +6190,7 @@ msgstr ""
 "�������������: �������� ��� %%-�������� ��� url ��������� (���� ������).\n"
 "               ����� �� ������������.\n"
 
-#: g10/sign.c:170
+#: g10/sign.c:138
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6178,23 +6199,23 @@ msgstr ""
 "�������������: �������� ��� %%-�������� ��� url ��������� (���� ������).\n"
 "               ����� �� ������������.\n"
 
-#: g10/sign.c:343
+#: g10/sign.c:311
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 
-#: g10/sign.c:352
+#: g10/sign.c:320
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s �������� ���: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ����������-���������� �� ������� ����� PGP 2.x ���� ��\n"
 "--pgp2 ���������\n"
 
-#: g10/sign.c:864
+#: g10/sign.c:834
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6202,16 +6223,16 @@ msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
-#: g10/sign.c:991
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "��������:"
 
-#: g10/sign.c:1106
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ���������� ������ �� ������� ����� PGP 2.x �� ��������� --pgp2\n"
 
-#: g10/sign.c:1290
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s ������������� �� ��������������\n"
@@ -6926,64 +6947,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:114 sm/gpgsm.c:361
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 #, fuzzy
 msgid "read options from file"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|�����|����� ��� �������� �� ��������������� ���������"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|�����|����� ��� �������� �� ��������������� ���������"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "�� ����� ����������"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:135
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "������������� �������\n"
 
-#: scd/scdaemon.c:209
+#: scd/scdaemon.c:210
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: scd/scdaemon.c:211
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:658
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1006
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1011
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7017,11 +7038,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1631
+#: sm/certchain.c:195 sm/certchain.c:1646
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1631
+#: sm/certchain.c:196 sm/certchain.c:1646
 #, fuzzy
 msgid "shell"
 msgstr "help"
@@ -7062,8 +7083,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
@@ -7231,7 +7252,7 @@ msgstr ""
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1730
+#: sm/certchain.c:1462 sm/certchain.c:1745
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "� ���������� %c%lu ������������\n"
@@ -7246,11 +7267,11 @@ msgstr "������������� ��������� �������������.\n"
 msgid "root certificate is good\n"
 msgstr "���� �������������"
 
-#: sm/certchain.c:1620
+#: sm/certchain.c:1635
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1629
+#: sm/certchain.c:1644
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7265,7 +7286,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7279,25 +7300,25 @@ msgstr "���|���"
 msgid "[none]"
 msgstr "�������"
 
-#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
+#: sm/certdump.c:583 sm/certdump.c:628 sm/certdump.c:693 sm/certdump.c:746
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "������: �� ������ ���������\n"
 
-#: sm/certdump.c:558 sm/certdump.c:603
+#: sm/certdump.c:591 sm/certdump.c:636
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:640 sm/certdump.c:696
+#: sm/certdump.c:673 sm/certdump.c:729
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:665 sm/certdump.c:719
+#: sm/certdump.c:698 sm/certdump.c:752
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "������: �� ������ ���������\n"
 
-#: sm/certdump.c:936
+#: sm/certdump.c:946
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7425,181 +7446,190 @@ msgstr "�������� block �������� �������: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(��� ������ ���������)\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[������]|���������� ���� ���������"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[������]|���������� ���� �� ���������������� ���������"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list external keys"
 msgstr "���������� ��� ������ �������� ��������"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
 #, fuzzy
 msgid "list certificate chain"
 msgstr "���� �������������"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "import certificates"
 msgstr "���� �������������"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "export certificates"
 msgstr "���� �������������"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:270
 #, fuzzy
 msgid "change a passphrase"
 msgstr "������ ��� ������ ������"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "���������� ascii ������������ ������"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 msgid "|NAME|use NAME as default recipient"
 msgstr "|�����|����� ��� �������� �� ��������������� ���������"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "use the default key as default recipient"
 msgstr "����� ��� ��������������� �������� �� ��������������� ���������"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr "�� ����� ����������"
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:345
+msgid "|FILE|write a server mode log to FILE"
+msgstr ""
+
+#: sm/gpgsm.c:347
+#, fuzzy
+msgid "|FILE|write an audit log to FILE"
+msgstr "|������|������� ��� ���������� ��������� ������"
+
+#: sm/gpgsm.c:349
 msgid "force v3 signatures"
 msgstr "������������ ������ v3 ���������"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr "����� ������� MDC ��� �������������"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr "��������� batch: �� �� �������� ���������"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr "�������� ��� ���� ������������ ���������"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr "�������� ��� ���� ������������ ���������"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:359
 msgid "add this keyring to the list of keyrings"
 msgstr "�������� ����� ��� �������� ��� ����� ��� �����������"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:360
 msgid "add this secret keyring to the list"
 msgstr "�������� ����� ��� �������� ����������� ��� �����"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|�����|����� �������� ��� �������������� ������� ������"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|�����������|����� ����� ��� ���������� �������� ��� ���������"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:363
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|�����|���������� ��� ��� ���������� ���������� �� �����"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:379
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr "|������|������� ��� ���������� ��������� ������"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:388
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|�����|����� ���������� �������������� �����"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:390
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|�����|����� ���������� ��������� ��������� ����� "
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:392
 msgid "|N|use compress algorithm N"
 msgstr "|N|����� ���������� ��������� N"
 
-#: sm/gpgsm.c:568
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: sm/gpgsm.c:571
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7610,36 +7640,36 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: sm/gpgsm.c:650
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "�����: gpg [��������] "
 
-#: sm/gpgsm.c:748
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: sm/gpgsm.c:759
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
 
-#: sm/gpgsm.c:1315
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1411
+#: sm/gpgsm.c:1468
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "������� ���  `%s'\n"
 
-#: sm/gpgsm.c:1429
+#: sm/gpgsm.c:1486
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: sm/gpgsm.c:1612
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7662,7 +7692,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:1274
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@ -7725,17 +7755,17 @@ msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:111
+#: sm/qualified.c:105
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "������: �� ������ ���������\n"
 
-#: sm/qualified.c:129
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:225
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7746,13 +7776,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234 sm/verify.c:536
+#: sm/qualified.c:209 sm/verify.c:580
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:327
+#: sm/qualified.c:277
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7765,293 +7795,311 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:424
 #, fuzzy
 msgid "Signature made "
 msgstr "�������� ����� ���� %s.\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:428
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:429
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: sm/verify.c:514
+#: sm/verify.c:558
 #, fuzzy
 msgid "Good signature from"
 msgstr "���� �������� ��� \""
 
-#: sm/verify.c:515
+#: sm/verify.c:559
 #, fuzzy
 msgid "                aka"
 msgstr "                ������ ��� \""
 
-#: sm/verify.c:533
+#: sm/verify.c:577
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr ""
 "\n"
 "���� �� ����� ��� ����-��������.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "�����������"
 
-#: tools/gpg-connect-agent.c:60
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:127
+#: tools/gpg-connect-agent.c:74
+#, fuzzy
+msgid "|FILE|run commands from FILE on startup"
+msgstr "|������|������� ��� ���������� ��������� ������"
+
+#: tools/gpg-connect-agent.c:75
+msgid "run /subst on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:174
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: tools/gpg-connect-agent.c:130
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:314
+#: tools/gpg-connect-agent.c:1155
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:323
+#: tools/gpg-connect-agent.c:1164
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:381
+#: tools/gpg-connect-agent.c:1219 tools/gpg-connect-agent.c:1645
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "�������� block �������� �������: %s\n"
+
+#: tools/gpg-connect-agent.c:1299
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "� ������ ����� ���� ������\n"
 
-#: tools/gpg-connect-agent.c:385
+#: tools/gpg-connect-agent.c:1303
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:1619
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
 
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:1637
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "� �������� �������: %s\n"
 
-#: tools/gpg-connect-agent.c:473
-#, fuzzy, c-format
-msgid "receiving line failed: %s\n"
-msgstr "�������� block �������� �������: %s\n"
-
-#: tools/gpg-connect-agent.c:789
+#: tools/gpg-connect-agent.c:1986
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "������ ��� �������� ���� �� `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:798
+#: tools/gpg-connect-agent.c:1995
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "������ ��� �������� ���� �� `%s': %s\n"
 
-#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
-#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
+#: tools/gpgconf-comp.c:459 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:773
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:796
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
-#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
+#: tools/gpgconf-comp.c:482 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:803
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
-#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:487 tools/gpgconf-comp.c:606 tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:729 tools/gpgconf-comp.c:811
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:737
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:504
+#: tools/gpgconf-comp.c:502
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:506
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:512
+#: tools/gpgconf-comp.c:510
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:526
+#: tools/gpgconf-comp.c:524
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:527
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:531
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:535
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:539
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:543
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|����� ��� ���������� ������ ������ N"
 
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:547
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:710
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|�����|������������� ��� �����"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:669
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:674
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:719
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|�����|����� ���������� �������������� ����� ��� ������� �������"
 
-#: tools/gpgconf-comp.c:744
+#: tools/gpgconf-comp.c:742
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:786
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:824
+#: tools/gpgconf-comp.c:822
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:834
+#: tools/gpgconf-comp.c:832
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:845
+#: tools/gpgconf-comp.c:843
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:850
+#: tools/gpgconf-comp.c:848
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:887
+#: tools/gpgconf-comp.c:885
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2982
+#: tools/gpgconf-comp.c:3006
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:59
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
+#, fuzzy
+msgid "list global configuration file"
+msgstr "������� ����������� ��������� \"%s\"\n"
+
+#: tools/gpgconf.c:67
 #, fuzzy
 msgid "check global configuration file"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:71
+msgid "use as output file"
+msgstr "����� �� ������� ������"
+
+#: tools/gpgconf.c:75
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:100
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:176 tools/gpgconf.c:209
+#: tools/gpgconf.c:202 tools/gpgconf.c:240
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "�����: gpg [��������] "
 
-#: tools/gpgconf.c:178
+#: tools/gpgconf.c:204
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:187
+#: tools/gpgconf.c:213
 #, fuzzy
 msgid "Component not found"
 msgstr "��� ������� �� ������� ������"
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:242
 #, fuzzy
 msgid "No argument allowed"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
@@ -8145,92 +8193,109 @@ msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 msgid "error closing %s: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: tools/symcryptrun.c:515
+#: tools/symcryptrun.c:486
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "��� ������������ � ������������� �������� ������������\n"
 
-#: tools/symcryptrun.c:521
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:556
+#: tools/symcryptrun.c:527
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: tools/symcryptrun.c:563
+#: tools/symcryptrun.c:534
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: tools/symcryptrun.c:579
+#: tools/symcryptrun.c:550
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:578
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: tools/symcryptrun.c:636
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: tools/symcryptrun.c:653
+#: tools/symcryptrun.c:624
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: tools/symcryptrun.c:705
+#: tools/symcryptrun.c:676
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: tools/symcryptrun.c:757
+#: tools/symcryptrun.c:728
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: tools/symcryptrun.c:771
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:826
+#: tools/symcryptrun.c:797
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: tools/symcryptrun.c:839
+#: tools/symcryptrun.c:810
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: tools/symcryptrun.c:1014
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1041
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1050
+#: tools/symcryptrun.c:1021
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "�������� ����������� ��������� �������� �� ��������� v3 (PGP 2.x ����)\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "�������� ����������� ��������� �������� �� ��������� �������� v3 (PGP 2.x "
+#~ "����)\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "�������� ����������� URL ��������� �� ��������� v3 (PGP 2.x ����)\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "�������� ����������� URL ��������� �� ��������� �������� v3 (PGP 2.x "
+#~ "����)\n"
+
 #, fuzzy
 #~ msgid "shelll"
 #~ msgstr "help"
diff --git a/po/eo.po b/po/eo.po
index c5b55cf59..192f6ae8a 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-09-14 13:27+0200\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -14,59 +14,75 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-3\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: agent/call-pinentry.c:438
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:441
+#: agent/call-pinentry.c:551
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/call-pinentry.c:489
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+msgid "Quality:"
+msgstr ""
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 #, fuzzy
 msgid "PIN too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:668
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:676
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nevalida signo en nomo\n"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:535
+#: agent/call-pinentry.c:693
 #, fuzzy
 msgid "Bad PIN"
 msgstr "malbona MPI"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:694
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "malbona pasfrazo"
 
-#: agent/call-pinentry.c:572
+#: agent/call-pinentry.c:730
 #, fuzzy
 msgid "Passphrase"
 msgstr "malbona pasfrazo"
@@ -76,21 +92,21 @@ msgstr "malbona pasfrazo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
-#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1865
-#: sm/gpgsm.c:1902 sm/gpgsm.c:1940 sm/qualified.c:72
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
@@ -130,14 +146,25 @@ msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/command-ssh.c:2349
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "�an�i la pasfrazon"
+
+#: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2850
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/command-ssh.c:2885
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
@@ -183,76 +210,66 @@ msgstr "Donu pasfrazon\n"
 msgid "Take this one anyway"
 msgstr "�u tamen uzi �i tiun �losilon? "
 
-#: agent/genkey.c:185
+#: agent/genkey.c:191
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u character long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u characters long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:202
+#: agent/genkey.c:212
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digit or special character."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digits or special characters."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:225
+#: agent/genkey.c:235
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
-"passphrase may not%0Abe a known term or match certain pattern."
+"Warning: You have entered an insecure passphrase.%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:238
+#: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:240
+#: agent/genkey.c:253
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:246
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:290
+#: agent/genkey.c:306
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "�an�i la pasfrazon"
-
-#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
-#: tools/symcryptrun.c:456
-msgid "does not match - try again"
-msgstr ""
-
-#: agent/genkey.c:412
+#: agent/genkey.c:429
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:104
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -262,66 +279,65 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:109
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:69 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detala eligo"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:341
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:112
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:113
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
-#: tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "ser�i �losilojn �e �losilservilo"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:134
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualigi la fido-datenaron"
@@ -359,150 +375,165 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:91 tools/symcryptrun.c:204
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Bonvolu raporti cimojn al <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:512 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:340 sm/gpgsm.c:819 sm/gpgsm.c:822 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: agent/gpg-agent.c:610 agent/gpg-agent.c:1177 g10/gpg.c:2027
-#: scd/scdaemon.c:421 sm/gpgsm.c:914 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: agent/gpg-agent.c:947 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: agent/gpg-agent.c:1247 agent/gpg-agent.c:1373 agent/gpg-agent.c:1377
-#: agent/gpg-agent.c:1418 agent/gpg-agent.c:1422 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:908
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
+#: agent/gpg-agent.c:1321
+#, fuzzy, c-format
+msgid "socket name `%s' is too long\n"
+msgstr "Valida atestilrevoko"
+
+#: agent/gpg-agent.c:1333
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
+#, fuzzy
+msgid "error getting nonce for the socket\n"
+msgstr "eraro dum kreado de pasfrazo: %s\n"
+
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: dosierujo kreita\n"
 
-#: agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1448
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1438
+#: agent/gpg-agent.c:1452
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:1549
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
+#, fuzzy, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "eraro dum legado de '%s': %s\n"
+
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1554
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1571
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1576
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu �losiloj ignoritaj\n"
 
-#: agent/gpg-agent.c:1809
+#: agent/gpg-agent.c:1850
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:756
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
-#: tools/gpg-connect-agent.c:767
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
@@ -529,40 +560,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1188
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1191
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/protect-tool.c:1216
+#: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1221
+#: agent/protect-tool.c:1199
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "malbona pasfrazo"
 
-#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "nuligita de uzanto\n"
@@ -674,7 +705,8 @@ msgstr "�an�i la pasfrazon"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1338
+#: tools/gpgconf-comp.c:1641
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
@@ -824,77 +856,82 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:366
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr "kiraso: %s\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr "nevalida kiraso�apo: "
 
-#: g10/armor.c:416
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr "kiraso�apo: "
 
-#: g10/armor.c:427
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr "nevalida �apo de klarteksta subskribo\n"
 
-#: g10/armor.c:479
+#: g10/armor.c:455
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "kiraso�apo: "
+
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr "ingitaj klartekstaj subskriboj\n"
 
-#: g10/armor.c:614
+#: g10/armor.c:643
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "neatendita kiraso:"
 
-#: g10/armor.c:626
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr "nevalida strek-eskapita linio: "
 
-#: g10/armor.c:780 g10/armor.c:1390
+#: g10/armor.c:809 g10/armor.c:1419
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "nevalida signo %02x en bazo 64 ignorita\n"
 
-#: g10/armor.c:823
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr "tro frua dosierfino (nenia CRC)\n"
 
-#: g10/armor.c:857
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr "tro frua dosierfino (en CRC)\n"
 
-#: g10/armor.c:865
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr "misformita CRC\n"
 
-#: g10/armor.c:869 g10/armor.c:1427
+#: g10/armor.c:898 g10/armor.c:1456
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-eraro; %06lx - %06lx\n"
 
-#: g10/armor.c:889
+#: g10/armor.c:918
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "tro frua dosierfino (en vosto)\n"
 
-#: g10/armor.c:893
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr "eraro en vostolinio\n"
 
-#: g10/armor.c:1204
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/armor.c:1209
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "nevalida kiraso: linio pli longa ol %d signojn\n"
 
-#: g10/armor.c:1213
+#: g10/armor.c:1242
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1242,11 +1279,11 @@ msgstr "skribas sekretan �losilon al '%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: g10/decrypt.c:110 g10/encode.c:890
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por �i tiu komando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
@@ -1257,7 +1294,7 @@ msgstr "ne povas malfermi '%s'\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1300,7 +1337,7 @@ msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "uzu la opcion \"--delete-secret-key\" por forvi�i �in unue.\n"
 
-#: g10/encode.c:226 g10/sign.c:1296
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
@@ -1319,7 +1356,7 @@ msgstr "subskribado malsukcesis: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
@@ -1344,24 +1381,24 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/encode.c:669 g10/sign.c:966
+#: g10/encode.c:655 g10/sign.c:936
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/encode.c:765
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, fuzzy, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/encode.c:862
+#: g10/encode.c:848
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s-�ifrita por: %s\n"
@@ -1544,7 +1581,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:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1552,133 +1589,133 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: g10/gpg.c:370
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/gpg.c:372 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/gpg.c:375 sm/gpgsm.c:248
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/gpg.c:377 sm/gpgsm.c:249
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/gpg.c:381 sm/gpgsm.c:252
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "listigi �losilojn"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "listigi �losilojn kaj subskribojn"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/gpg.c:386 sm/gpgsm.c:254
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "remove keys from the public keyring"
 msgstr "forigi �losilojn de la publika �losilaro"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "remove keys from the secret keyring"
 msgstr "forigi �losilojn de la sekreta �losilaro"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "subskribi a� redakti �losilon"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/gpg.c:397 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:402
 msgid "search for keys on a key server"
 msgstr "ser�i �losilojn �e �losilservilo"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "update all keys from a keyserver"
 msgstr "aktualigi �iujn �losilojn de �losilservilo"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "importi/kunfandi �losilojn"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:410
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/gpg.c:430 sm/gpgsm.c:264
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1688,47 +1725,48 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:281
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/gpg.c:436 sm/gpgsm.c:293
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/gpg.c:447 sm/gpgsm.c:331
+#: g10/gpg.c:449 sm/gpgsm.c:333
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
 
-#: g10/gpg.c:448 sm/gpgsm.c:334
+#: g10/gpg.c:450 sm/gpgsm.c:336
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:336
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
-msgid "use as output file"
-msgstr "uzi dosieron por eligo"
+#: g10/gpg.c:469 sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:523
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:524
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:397
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1736,7 +1774,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:400
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1756,15 +1794,15 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/gpg.c:750 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Bonvolu raporti cimojn al <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:767
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1774,7 +1812,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:578
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1782,565 +1820,569 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/gpg.c:784
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:791 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:798
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:805 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
 
-#: g10/gpg.c:875
+#: g10/gpg.c:817 sm/gpgsm.c:603
+msgid "Used libraries:"
+msgstr ""
+
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:715
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/gpg.c:1063
+#: g10/gpg.c:1113
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1260
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1263
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1266
+#: g10/gpg.c:1316
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1272
+#: g10/gpg.c:1322
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1325
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1328
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1284
+#: g10/gpg.c:1334
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1337
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1340
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1296
+#: g10/gpg.c:1346
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1349
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1352
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1445
+#: g10/gpg.c:1495
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1594
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1602
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1610
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "montri, en kiu �losilaro estas listigita �losilo"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1612
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1825
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1981
+#: g10/gpg.c:2030
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2493
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/gpg.c:2528
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2610
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2613
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2620
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2551
+#: g10/gpg.c:2623
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2630
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2561
+#: g10/gpg.c:2633
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2645
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2653
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2655
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2659
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2670
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2673
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2855
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1298
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2975
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "eblas fari nur apartajn kaj klartekstajn subskribojn kun --pgp2\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "ne eblas samtempe subskribi kaj �ifri kun --pgp2\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:3014
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1370
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1378
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3092
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3098
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3117
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3119
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3121
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3135
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3144
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3148
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3152
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3185
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3232
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3237
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3242
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3375
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3403
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3449
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3454
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3474
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3626
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3628
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3630
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3641
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3651
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4233
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4235
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4268
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@ -2355,7 +2397,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:75 sm/gpgsm.c:372
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
@@ -2878,13 +2920,13 @@ msgstr "�losilo %08lX: nova �losilo - ignorita\n"
 msgid "no writable keyring found: %s\n"
 msgstr "neniu skribebla �losilaro trovita: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2369 g10/import.c:2391
+#: g10/import.c:2381 g10/import.c:2403
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
@@ -2974,7 +3016,7 @@ msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 msgid "importing secret keys not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/import.c:1158 g10/import.c:2384
+#: g10/import.c:1158 g10/import.c:2396
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "mankas implicita sekreta �losilaro: %s\n"
@@ -3095,41 +3137,41 @@ msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:1732
+#: g10/import.c:1744
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:1794
+#: g10/import.c:1806
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/import.c:1808
+#: g10/import.c:1820
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/import.c:1867
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:1901
+#: g10/import.c:1913
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2302
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2298
+#: g10/import.c:2310
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2312
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
@@ -3472,7 +3514,7 @@ msgid "Really sign? (y/N) "
 msgstr "�u vere subskribi? "
 
 #: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:348
+#: g10/keyedit.c:5019 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
@@ -3837,8 +3879,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
 #: g10/keyedit.c:2140
@@ -4717,7 +4758,7 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:273
+#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4725,7 +4766,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:275
+#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5336,17 +5377,17 @@ msgstr "ne traktita"
 msgid "uncompressed|none"
 msgstr "ne traktita"
 
-#: g10/misc.c:874
+#: g10/misc.c:891
 #, fuzzy, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
 
-#: g10/misc.c:1049
+#: g10/misc.c:1066
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/misc.c:1074
+#: g10/misc.c:1091
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
@@ -5403,12 +5444,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:603
+#: g10/passphrase.c:295 g10/passphrase.c:581
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (�ef�losilo %08lX)"
 
-#: g10/passphrase.c:327
+#: g10/passphrase.c:309
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5419,24 +5460,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bita %s �losilo, ID %08lX, kreita je %s%s\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:334
 msgid "Repeat passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:336
 msgid "Enter passphrase\n"
 msgstr "Donu pasfrazon\n"
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:363
 msgid "cancelled by user\n"
 msgstr "nuligita de uzanto\n"
 
-#: g10/passphrase.c:384 g10/passphrase.c:450
+#: g10/passphrase.c:369 g10/passphrase.c:428
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
 
-#: g10/passphrase.c:582
+#: g10/passphrase.c:560
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5446,12 +5487,12 @@ msgstr ""
 "Vi bezonas pasfrazon por mal�losi la sekretan �losilon\n"
 "por la uzanto: \""
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:568
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bita %s-�losilo, %08lX, kreita je %s"
 
-#: g10/passphrase.c:599
+#: g10/passphrase.c:577
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6083,30 +6124,14 @@ msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/sign.c:82
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:90
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-
-#: g10/sign.c:104
+#: g10/sign.c:89
 #, fuzzy, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
 "kompletigo.\n"
 
-#: g10/sign.c:121
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:129
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:142
+#: g10/sign.c:115
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6114,7 +6139,7 @@ msgstr ""
 "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
 "kompletigo.\n"
 
-#: g10/sign.c:170
+#: g10/sign.c:138
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6123,37 +6148,37 @@ msgstr ""
 "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
 "kompletigo.\n"
 
-#: g10/sign.c:343
+#: g10/sign.c:311
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: g10/sign.c:352
+#: g10/sign.c:320
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:758
 #, fuzzy
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "eblas subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
 
-#: g10/sign.c:864
+#: g10/sign.c:834
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/sign.c:991
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "subskribas:"
 
-#: g10/sign.c:1106
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "eblas klartekste subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
 
-#: g10/sign.c:1290
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s �ifrado estos aplikata\n"
@@ -6863,64 +6888,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:114 sm/gpgsm.c:361
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 #, fuzzy
 msgid "read options from file"
 msgstr "legas opciojn el '%s'\n"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "tute ne uzi la terminalon"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:135
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "malkongruaj komandoj\n"
 
-#: scd/scdaemon.c:209
+#: scd/scdaemon.c:210
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: scd/scdaemon.c:211
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:658
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1006
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1011
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6954,11 +6979,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1631
+#: sm/certchain.c:195 sm/certchain.c:1646
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1631
+#: sm/certchain.c:196 sm/certchain.c:1646
 #, fuzzy
 msgid "shell"
 msgstr "helpo"
@@ -6999,8 +7024,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
@@ -7178,7 +7203,7 @@ msgstr ""
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1730
+#: sm/certchain.c:1462 sm/certchain.c:1745
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "Valida atestilrevoko"
@@ -7195,11 +7220,11 @@ msgstr ""
 "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
 "\n"
 
-#: sm/certchain.c:1620
+#: sm/certchain.c:1635
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1629
+#: sm/certchain.c:1644
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7214,7 +7239,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7228,25 +7253,25 @@ msgstr "ne"
 msgid "[none]"
 msgstr "nekonata versio"
 
-#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
+#: sm/certdump.c:583 sm/certdump.c:628 sm/certdump.c:693 sm/certdump.c:746
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: sm/certdump.c:558 sm/certdump.c:603
+#: sm/certdump.c:591 sm/certdump.c:636
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:640 sm/certdump.c:696
+#: sm/certdump.c:673 sm/certdump.c:729
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:665 sm/certdump.c:719
+#: sm/certdump.c:698 sm/certdump.c:752
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: sm/certdump.c:936
+#: sm/certdump.c:946
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7373,181 +7398,190 @@ msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 msgid "no valid recipients given\n"
 msgstr "nevalida respondo de agento\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list external keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Valida atestilrevoko"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "forigi �losilojn de la publika �losilaro"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "import certificates"
 msgstr "Bona atestilo"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "export certificates"
 msgstr "Bona atestilo"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:270
 #, fuzzy
 msgid "change a passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "krei eligon en askia kiraso"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "use the default key as default recipient"
 msgstr "uzi la implicitan �losilon kiel implicitan ricevonton"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr "tute ne uzi la terminalon"
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:345
+msgid "|FILE|write a server mode log to FILE"
+msgstr ""
+
+#: sm/gpgsm.c:347
+#, fuzzy
+msgid "|FILE|write an audit log to FILE"
+msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
+
+#: sm/gpgsm.c:349
 msgid "force v3 signatures"
 msgstr "devigi v3-subskribojn"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr "�iam uzi sigelon (MDC) por �ifrado"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr "neinteraga re�imo: neniam demandi"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr "supozi \"jes\" �e la plej multaj demandoj"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr "supozi \"ne\" �e la plej multaj demandoj"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:359
 msgid "add this keyring to the list of keyrings"
 msgstr "aldoni �i tiun �losilaron al la listo de �losilaroj"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:360
 msgid "add this secret keyring to the list"
 msgstr "aldoni �i tiun sekretan �losilaron al la listo"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVILO|uzi �i tiun �losilservilon por ser�i �losilojn"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:363
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:379
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:388
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:390
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMO|uzi kompendi-metodon NOMO"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:392
 msgid "|N|use compress algorithm N"
 msgstr "|N|uzi densig-metodon N"
 
-#: sm/gpgsm.c:568
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: sm/gpgsm.c:571
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7558,36 +7592,36 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: sm/gpgsm.c:650
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: sm/gpgsm.c:748
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
 
-#: sm/gpgsm.c:759
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: sm/gpgsm.c:1315
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1411
+#: sm/gpgsm.c:1468
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: sm/gpgsm.c:1429
+#: sm/gpgsm.c:1486
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: sm/gpgsm.c:1612
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7610,7 +7644,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:1274
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -7673,17 +7707,17 @@ msgstr "eraro dum legado de '%s': %s\n"
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:111
+#: sm/qualified.c:105
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: sm/qualified.c:129
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:225
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7694,13 +7728,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234 sm/verify.c:536
+#: sm/qualified.c:209 sm/verify.c:580
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:327
+#: sm/qualified.c:277
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7713,291 +7747,309 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:424
 #, fuzzy
 msgid "Signature made "
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:428
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:429
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/verify.c:514
+#: sm/verify.c:558
 #, fuzzy
 msgid "Good signature from"
 msgstr "Bona subskribo de \""
 
-#: sm/verify.c:515
+#: sm/verify.c:559
 #, fuzzy
 msgid "                aka"
 msgstr "            alinome \""
 
-#: sm/verify.c:533
+#: sm/verify.c:577
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "fini"
 
-#: tools/gpg-connect-agent.c:60
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:127
+#: tools/gpg-connect-agent.c:74
+#, fuzzy
+msgid "|FILE|run commands from FILE on startup"
+msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
+
+#: tools/gpg-connect-agent.c:75
+msgid "run /subst on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:174
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: tools/gpg-connect-agent.c:130
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:314
+#: tools/gpg-connect-agent.c:1155
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:323
+#: tools/gpg-connect-agent.c:1164
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:381
+#: tools/gpg-connect-agent.c:1219 tools/gpg-connect-agent.c:1645
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+
+#: tools/gpg-connect-agent.c:1299
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "pasfrazo estas tro longa\n"
 
-#: tools/gpg-connect-agent.c:385
+#: tools/gpg-connect-agent.c:1303
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:1619
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:1637
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: tools/gpg-connect-agent.c:473
-#, fuzzy, c-format
-msgid "receiving line failed: %s\n"
-msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
-
-#: tools/gpg-connect-agent.c:789
+#: tools/gpg-connect-agent.c:1986
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: tools/gpg-connect-agent.c:798
+#: tools/gpg-connect-agent.c:1995
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
-#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
+#: tools/gpgconf-comp.c:459 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:773
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:796
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
-#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
+#: tools/gpgconf-comp.c:482 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:803
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
-#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:487 tools/gpgconf-comp.c:606 tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:729 tools/gpgconf-comp.c:811
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:737
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:504
+#: tools/gpgconf-comp.c:502
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:506
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:512
+#: tools/gpgconf-comp.c:510
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:526
+#: tools/gpgconf-comp.c:524
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:527
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:531
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:535
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:539
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:543
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|uzi pasfraz-re�imon N"
 
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:547
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:710
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:669
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:674
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:719
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO por pasfrazoj"
 
-#: tools/gpgconf-comp.c:744
+#: tools/gpgconf-comp.c:742
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:786
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:824
+#: tools/gpgconf-comp.c:822
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:834
+#: tools/gpgconf-comp.c:832
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:845
+#: tools/gpgconf-comp.c:843
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:850
+#: tools/gpgconf-comp.c:848
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:887
+#: tools/gpgconf-comp.c:885
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2982
+#: tools/gpgconf-comp.c:3006
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:59
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
+#, fuzzy
+msgid "list global configuration file"
+msgstr "%s: nova opcio-dosiero kreita\n"
+
+#: tools/gpgconf.c:67
 #, fuzzy
 msgid "check global configuration file"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:71
+msgid "use as output file"
+msgstr "uzi dosieron por eligo"
+
+#: tools/gpgconf.c:75
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:100
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:176 tools/gpgconf.c:209
+#: tools/gpgconf.c:202 tools/gpgconf.c:240
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: tools/gpgconf.c:178
+#: tools/gpgconf.c:204
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:187
+#: tools/gpgconf.c:213
 #, fuzzy
 msgid "Component not found"
 msgstr "publika �losilo ne trovita"
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:242
 #, fuzzy
 msgid "No argument allowed"
 msgstr "skribas sekretan �losilon al '%s'\n"
@@ -8091,87 +8143,87 @@ msgstr "eraro dum legado de '%s': %s\n"
 msgid "error closing %s: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: tools/symcryptrun.c:515
+#: tools/symcryptrun.c:486
 msgid "no --program option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:521
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:556
+#: tools/symcryptrun.c:527
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: tools/symcryptrun.c:563
+#: tools/symcryptrun.c:534
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: tools/symcryptrun.c:579
+#: tools/symcryptrun.c:550
 #, fuzzy, c-format
 msgid "could not fork: %s\n"
 msgstr "%s: uzanto ne trovita: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:578
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:636
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:653
+#: tools/symcryptrun.c:624
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:705
+#: tools/symcryptrun.c:676
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:757
+#: tools/symcryptrun.c:728
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: tools/symcryptrun.c:771
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:826
+#: tools/symcryptrun.c:797
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: tools/symcryptrun.c:839
+#: tools/symcryptrun.c:810
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: tools/symcryptrun.c:1014
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1041
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1050
+#: tools/symcryptrun.c:1021
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
diff --git a/po/es.po b/po/es.po
index 88d3bf772..93da4e73e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-09-14 13:27+0200\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
 "PO-Revision-Date: 2007-08-16 11:35+0200\n"
 "Last-Translator: Jaime Su�rez <jsuarez@ono.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -18,49 +18,66 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "fallo al almacenar la huella digital: %s\n"
 
-#: agent/call-pinentry.c:438
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:441
+#: agent/call-pinentry.c:551
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 
-#: agent/call-pinentry.c:489
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+#, fuzzy
+msgid "Quality:"
+msgstr "validez: %s"
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 #, fuzzy
 msgid "PIN too long"
 msgstr "l�nea demasiado larga"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:668
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "frase contrase�a demasiado larga\n"
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:676
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter inv�lido en el nombre\n"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:535
+#: agent/call-pinentry.c:693
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorrecto"
@@ -74,7 +91,7 @@ msgstr "MPI incorrecto"
 # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
 # �Es que son m�s listos? :-)
 #
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:694
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "Frase contrase�a incorrecta"
@@ -88,7 +105,7 @@ msgstr "Frase contrase�a incorrecta"
 # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
 # �Es que son m�s listos? :-)
 #
-#: agent/call-pinentry.c:572
+#: agent/call-pinentry.c:730
 #, fuzzy
 msgid "Passphrase"
 msgstr "Frase contrase�a incorrecta"
@@ -98,21 +115,21 @@ msgstr "Frase contrase�a incorrecta"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "el resumen protector %d no puede ser utilizado\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no se puede crear %s: %s\n"
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
-#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1865
-#: sm/gpgsm.c:1902 sm/gpgsm.c:1940 sm/qualified.c:72
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
@@ -152,14 +169,25 @@ msgstr "error escribiendo anillo `%s': %s\n"
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 
-#: agent/command-ssh.c:2349
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "cambia la frase contrase�a"
+
+#: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2850
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/command-ssh.c:2885
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: fallo en la creaci�n de la tabla hash: %s\n"
@@ -204,76 +232,66 @@ msgstr "Introduzca frase contrase�a\n"
 msgid "Take this one anyway"
 msgstr "�Usar esta clave de todas formas? (s/N) "
 
-#: agent/genkey.c:185
+#: agent/genkey.c:191
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u character long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u characters long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:202
+#: agent/genkey.c:212
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digit or special character."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digits or special characters."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:225
+#: agent/genkey.c:235
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
-"passphrase may not%0Abe a known term or match certain pattern."
+"Warning: You have entered an insecure passphrase.%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:238
+#: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:240
+#: agent/genkey.c:253
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:246
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:290
+#: agent/genkey.c:306
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Necesita una frase contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "cambia la frase contrase�a"
-
-#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
-#: tools/symcryptrun.c:456
-msgid "does not match - try again"
-msgstr ""
-
-#: agent/genkey.c:412
+#: agent/genkey.c:429
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:104
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -283,66 +301,65 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:109
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:69 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "prolijo"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:341
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:112
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:113
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
-#: tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "busca claves en un servidor de claves"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:134
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "establecer preferencias para todos los ID seleccionados"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualiza la base de datos de confianza"
@@ -380,151 +397,166 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:91 tools/symcryptrun.c:204
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor, informe de posibles \"bugs\" a <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:512 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:340 sm/gpgsm.c:819 sm/gpgsm.c:822 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, 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:610 agent/gpg-agent.c:1177 g10/gpg.c:2027
-#: scd/scdaemon.c:421 sm/gpgsm.c:914 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: agent/gpg-agent.c:947 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error creando `%s': %s\n"
 
-#: agent/gpg-agent.c:1247 agent/gpg-agent.c:1373 agent/gpg-agent.c:1377
-#: agent/gpg-agent.c:1418 agent/gpg-agent.c:1422 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:908
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no se puede crear el directorio `%s': %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
+#: agent/gpg-agent.c:1321
+#, fuzzy, c-format
+msgid "socket name `%s' is too long\n"
+msgstr "Revocaci�n de certificado v�lida"
+
+#: agent/gpg-agent.c:1333
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "el agente gpg no esta disponible en esta sesi�n\n"
 
-#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
+#, fuzzy
+msgid "error getting nonce for the socket\n"
+msgstr "error obteniendo nuevo PIN: %s\n"
+
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "error enviando a `%s': %s\n"
 
-#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "directorio `%s' creado\n"
 
-#: agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1448
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) fall� en %s: %s\n"
 
-#: agent/gpg-agent.c:1438
+#: agent/gpg-agent.c:1452
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: no se puede crear el directorio: %s\n"
 
-#: agent/gpg-agent.c:1549
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
+#, fuzzy, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "error leyendo `%s': %s\n"
+
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1554
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1571
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1576
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
 # msgstr "clave %08lX: %d nuevas subclaves\n"
-#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu claves omitidas\n"
 
-#: agent/gpg-agent.c:1809
+#: agent/gpg-agent.c:1850
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "el agente gpg no esta disponible en esta sesi�n\n"
 
-#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:756
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
 
-#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
-#: tools/gpg-connect-agent.c:767
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "el programa no permite usar el protocolo agente gpg versi�n %d\n"
@@ -551,23 +583,23 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1188
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1191
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 
-#: agent/protect-tool.c:1216
+#: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1221
+#: agent/protect-tool.c:1199
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
@@ -583,17 +615,17 @@ msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
 # �Es que son m�s listos? :-)
 #
-#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "Frase contrase�a incorrecta"
 
-#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "cancelado"
@@ -705,7 +737,8 @@ msgstr "cambia la frase contrase�a"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1338
+#: tools/gpgconf-comp.c:1641
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
@@ -853,75 +886,80 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:366
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr "cabecera de armadura inv�lida: "
 
-#: g10/armor.c:416
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr "cabecera de armadura: "
 
-#: g10/armor.c:427
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr "cabecera de firma clara inv�lida\n"
 
-#: g10/armor.c:479
+#: g10/armor.c:455
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "cabecera de armadura: "
+
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr "firmas en texto claro anidadas\n"
 
-#: g10/armor.c:614
+#: g10/armor.c:643
 msgid "unexpected armor: "
 msgstr "armadura inesperada: "
 
-#: g10/armor.c:626
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr "L�nea con guiones inv�lida: "
 
-#: g10/armor.c:780 g10/armor.c:1390
+#: g10/armor.c:809 g10/armor.c:1419
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caracter inv�lido radix64 %02X omitido\n"
 
-#: g10/armor.c:823
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr "Fin de fichero prematuro (falta suma de comprobaci�n)\n"
 
-#: g10/armor.c:857
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr "Fin de suma de comprobaci�n prematuro\n"
 
-#: g10/armor.c:865
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr "Suma de comprobaci�n mal creada\n"
 
-#: g10/armor.c:869 g10/armor.c:1427
+#: g10/armor.c:898 g10/armor.c:1456
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Error en suma de comprobaci�n: %06lX - %06lX\n"
 
-#: g10/armor.c:889
+#: g10/armor.c:918
 msgid "premature eof (in trailer)\n"
 msgstr "fin de fichero prematuro (en el cierre)\n"
 
-#: g10/armor.c:893
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr "error en la l�nea de cierre\n"
 
-#: g10/armor.c:1204
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr "no se han encontrados datos OpenPGP v�lidos\n"
 
-#: g10/armor.c:1209
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura incorrecta: l�nea m�s larga de %d caracteres\n"
 
-#: g10/armor.c:1213
+#: g10/armor.c:1242
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1243,11 +1281,11 @@ msgstr "No se permiten �rdenes de administrador\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inv�lida (pruebe \"help\")\n"
 
-#: g10/decrypt.c:110 g10/encode.c:890
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no se puede abrir `%s'\n"
@@ -1258,7 +1296,7 @@ msgstr "no se puede abrir `%s'\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "clave \"%s\" no encontrada: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1298,7 +1336,7 @@ msgstr "�hay una clave secreta para esta clave p�blica! \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use antes la opci�n \"--delete-secret-key\" para borrarla.\n"
 
-#: g10/encode.c:226 g10/sign.c:1296
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
@@ -1317,7 +1355,7 @@ msgstr "usando cifrado %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' ya est� comprimido\n"
 
-#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATENCI�N `%s' es un fichero vac�o\n"
@@ -1345,7 +1383,7 @@ msgstr ""
 "AVISO: forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
 "del destinatario\n"
 
-#: g10/encode.c:669 g10/sign.c:966
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1354,19 +1392,19 @@ msgstr ""
 "AVISO: forzar el algoritmo de compresi�n %s (%d) va en contra\n"
 "de las preferencias del receptor\n"
 
-#: g10/encode.c:765
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
 "del destinatario\n"
 
-#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "no puede usar %s en modo %s\n"
 
-#: g10/encode.c:862
+#: g10/encode.c:848
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
@@ -1553,7 +1591,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:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1561,132 +1599,132 @@ msgstr ""
 "@�rdenes:\n"
 " "
 
-#: g10/gpg.c:370
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[file]|crea una firma"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|crea una firma en texto claro"
 
-#: g10/gpg.c:372 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/gpg.c:375 sm/gpgsm.c:248
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/gpg.c:377 sm/gpgsm.c:249
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:381 sm/gpgsm.c:252
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "list and check key signatures"
 msgstr "lista y comprueba firmas de las claves"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/gpg.c:386 sm/gpgsm.c:254
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "remove keys from the public keyring"
 msgstr "elimina claves del anillo p�blico"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "remove keys from the secret keyring"
 msgstr "elimina claves del anillo privado"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaci�n"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/gpg.c:397 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:402
 msgid "search for keys on a key server"
 msgstr "busca claves en un servidor de claves"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "update all keys from a keyserver"
 msgstr "actualiza todas las claves desde un servidor de claves"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr "escribir estado de la tarjeta"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr "cambiar datos en la tarjeta"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr "cambiar el PIN de la tarjeta"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/gpg.c:430 sm/gpgsm.c:264
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1696,43 +1734,44 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:281
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/gpg.c:436 sm/gpgsm.c:293
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/gpg.c:447 sm/gpgsm.c:331
+#: g10/gpg.c:449 sm/gpgsm.c:333
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/gpg.c:448 sm/gpgsm.c:334
+#: g10/gpg.c:450 sm/gpgsm.c:336
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 no comprime)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:336
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
-msgid "use as output file"
-msgstr "usa como fichero de salida"
+#: g10/gpg.c:469 sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "preguntar antes de sobreescribir"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr "usar estilo OpenPGP estricto"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr "generar mensajes compatibles con PGP 2.x"
 
@@ -1740,7 +1779,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:553 sm/gpgsm.c:397
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1748,7 +1787,7 @@ msgstr ""
 "@\n"
 "(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:400
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1768,15 +1807,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/gpg.c:750 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:767
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1786,7 +1825,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:578
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1794,71 +1833,75 @@ msgstr ""
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/gpg.c:784
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr "Clave p�blica: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Cifrado: "
 
-#: g10/gpg.c:798
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/gpg.c:805 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:875
+#: g10/gpg.c:817 sm/gpgsm.c:603
+msgid "Used libraries:"
+msgstr ""
+
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:715
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/gpg.c:1063
+#: g10/gpg.c:1113
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no se encontr� el signo = en la definici�n de grupo `%s'\n"
 
-#: g10/gpg.c:1260
+#: g10/gpg.c:1310
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio personal `%s'\n"
 
-#: g10/gpg.c:1263
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedad insegura del fichero de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1266
+#: g10/gpg.c:1316
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedad insegura de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1272
+#: g10/gpg.c:1322
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio personal `%s'\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1325
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros del fichero de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1328
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1284
+#: g10/gpg.c:1334
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio contenedor de `%s'\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1337
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1866,18 +1909,18 @@ msgstr ""
 "AVISO: propiedad insegura del directorio contenedor del fichero de\n"
 "configuraci�n `%s'\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1340
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVISO: propiedad insegura del directorio contenedor de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1296
+#: g10/gpg.c:1346
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio contenedor de `%s'\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1349
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1885,446 +1928,446 @@ msgstr ""
 "AVISO: permisos inseguros del directorio contenedor del fichero de\n"
 "configuraci�n `%s'\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1352
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVISO: permisos inseguros del directorio contenedor de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1445
+#: g10/gpg.c:1495
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "art�culo de configuraci�n desconocido `%s'\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1594
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1602
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1610
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "muestra en qu� anillos est� una clave"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1612
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/gpg.c:1825
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1981
+#: g10/gpg.c:2030
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n"
 
-#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2493
+#: g10/gpg.c:2565
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: g10/gpg.c:2528
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2603
 msgid "invalid keyserver options\n"
 msgstr "opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2610
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2613
 msgid "invalid import options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2620
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2551
+#: g10/gpg.c:2623
 msgid "invalid export options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2630
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2561
+#: g10/gpg.c:2633
 msgid "invalid list options\n"
 msgstr "lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2645
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2653
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2655
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2659
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2670
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2673
 msgid "invalid verify options\n"
 msgstr "opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2855
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1298
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2975
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "no se ejecutar� en memoria insegura por %s\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s�lo puede hacer firmas separadas o en claro en modo --pgp2\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no puede firmar y cifrar a la vez en modo --pgp2\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "debe usar ficheros (no tuber�as) si trabaja con --pgp2 activo.\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:3014
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1370
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1378
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3092
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3098
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3117
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe estar en el rango de 1 a 255\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3119
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3121
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3135
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inv�lidas\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3144
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inv�lidas\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3148
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3152
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresi�n inv�lidas\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3185
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s a�n no funciona con %s\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3232
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "no puede usar el cifrado `%s' en modo %s\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3237
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "no puede usar el resumen `%s' en modo %s\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3242
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "no puede usar la compresi�n `%s' en modo %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "AVISO: se indicaron receptores (-r) sin clave p�blica de cifrado\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3375
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "el cifrado sim�trico de `%s' fall�: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3398
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "no puede usar --symetric --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "no puede usar --symetric --encrypt en modo %s\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3449
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "no puede usar --symetric --sign --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3454
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "no puede usar --symmetric --sign --encrypt en modo %s\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3474
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepci�n del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3630
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportaci�n de clave fallida: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3641
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "b�squeda del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3651
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovaci�n al servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -2332,19 +2375,19 @@ msgstr "[nombre_fichero]"
 # En espa�ol no se deja espacio antes de los puntos suspensivos
 # (Real Academia dixit) :)
 # Tomo nota :-). Este comentario d�jalo siempre.
-#: g10/gpg.c:3848
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4233
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica de certificado inv�lida\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4235
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4268
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
@@ -2360,7 +2403,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:75 sm/gpgsm.c:372
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaci�n de estado en este descriptor de fichero"
 
@@ -2902,13 +2945,13 @@ msgstr "clave %s: clave nueva - omitida\n"
 msgid "no writable keyring found: %s\n"
 msgstr "anillo de claves no escribible encontrado: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2369 g10/import.c:2391
+#: g10/import.c:2381 g10/import.c:2403
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
@@ -2997,7 +3040,7 @@ msgstr "clave %s: clave secreta con cifrado inv�lido %d - omitida\n"
 msgid "importing secret keys not allowed\n"
 msgstr "no se permite importar claves secretas\n"
 
-#: g10/import.c:1158 g10/import.c:2384
+#: g10/import.c:1158 g10/import.c:2396
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hay anillo secreto de claves por defecto: %s\n"
@@ -3119,42 +3162,42 @@ msgstr "clave %s: firma de subclave en lugar equivocado - omitida\n"
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "clave %s: firma de clase (0x%02x) inesperada - omitida\n"
 
-#: g10/import.c:1732
+#: g10/import.c:1744
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clave %s: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:1794
+#: g10/import.c:1806
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: la clave %s puede estar revocada: recuperando clave de revocaci�n %s\n"
 
-#: g10/import.c:1808
+#: g10/import.c:1820
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: la clave %s puede estar revocada: falta clave de revocaci�n %s.\n"
 
-#: g10/import.c:1867
+#: g10/import.c:1879
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clave %s: \"%s\" certificado de revocaci�n a�adido\n"
 
-#: g10/import.c:1901
+#: g10/import.c:1913
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clave %s: firma directa de clave a�adida\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2302
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "NOTA: un S/N de la clave no coincide con la de la tarjeta\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2310
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "NOTA: clave primaria en l�nea y almacenada en la tarjeta\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2312
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "NOTA: clave secundaria en l�nea y almacenada en la tarjeta\n"
 
@@ -3456,7 +3499,7 @@ msgid "Really sign? (y/N) "
 msgstr "�Firmar de verdad? (s/N) "
 
 #: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:348
+#: g10/keyedit.c:5019 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
@@ -3792,8 +3835,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�De verdad quiere revocar esta subclave? (s/N) "
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "La confianza del propietario no puede establecerse si se est� usando\n"
 "una base de datos de confianza propocionada por el usuario\n"
@@ -4653,7 +4695,7 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:273
+#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4661,7 +4703,7 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:275
+#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5257,17 +5299,17 @@ msgstr "Sin comprimir"
 msgid "uncompressed|none"
 msgstr "sin_comprimir|ninguno"
 
-#: g10/misc.c:874
+#: g10/misc.c:891
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "este mensaje podr�a no ser utilizable por %s\n"
 
-#: g10/misc.c:1049
+#: g10/misc.c:1066
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "opci�n ambigua `%s'\n"
 
-#: g10/misc.c:1074
+#: g10/misc.c:1091
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "opci�n desconocida `%s'\n"
@@ -5324,12 +5366,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquete de tipo %d tiene el bit cr�tico activado\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:603
+#: g10/passphrase.c:295 g10/passphrase.c:581
 #, c-format
 msgid " (main key ID %s)"
 msgstr "(ID de clave primaria %s)"
 
-#: g10/passphrase.c:327
+#: g10/passphrase.c:309
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5340,24 +5382,24 @@ msgstr ""
 "del usuario: \"%.*s\"\n"
 "%u bits, clave %s, ID %s, creada el %s%s\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:334
 msgid "Repeat passphrase\n"
 msgstr "Repita frase contrase�a\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:336
 msgid "Enter passphrase\n"
 msgstr "Introduzca frase contrase�a\n"
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:363
 msgid "cancelled by user\n"
 msgstr "cancelado por el usuario\n"
 
-#: g10/passphrase.c:384 g10/passphrase.c:450
+#: g10/passphrase.c:369 g10/passphrase.c:428
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema con el agente: el agente devuelve 0x%lx\n"
 
-#: g10/passphrase.c:582
+#: g10/passphrase.c:560
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5366,12 +5408,12 @@ msgstr ""
 "Necesita una frase contrase�a para desbloquear la clave secreta\n"
 "del usuario: \"%s\"\n"
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:568
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "clave %2$s de %1$u bits, ID %3$s, creada el %4$s"
 
-#: g10/passphrase.c:599
+#: g10/passphrase.c:577
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (subclave en clave principal ID %s)"
@@ -5999,30 +6041,13 @@ msgstr "clave %s: no hay subclave para la firma de revocaci�n de subclave\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "clave %s: no hay subclave para firma de subclave de enlace\n"
 
-#: g10/sign.c:82
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "no uede poner datos de notaci�n en claves v3 (estilo PGP 2.x)\n"
-
-#: g10/sign.c:90
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
-
-#: g10/sign.c:104
+#: g10/sign.c:89
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVISO: no puedo expandir el %% de la url de pol�tica . Se usa sin expandir.\n"
 
-#: g10/sign.c:121
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "no puede poner URL de pol�tica en firmas v3 (estilo PGP 2.x)\n"
-
-#: g10/sign.c:129
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-"no puede poner URL de pol�tica en firmas de claves v3 (estilo PGP 2.x)\n"
-
-#: g10/sign.c:142
+#: g10/sign.c:115
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6030,7 +6055,7 @@ msgstr ""
 "AVISO: no puedo expandir el %% de la url de pol�tica (demasiado larga).\n"
 "Se usa sin expandir.\n"
 
-#: g10/sign.c:170
+#: g10/sign.c:138
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6039,23 +6064,23 @@ msgstr ""
 "AVISO: no puedo expandir el %% de la URL del servidor de claves\n"
 "preferido. Se usa sin expandir.\n"
 
-#: g10/sign.c:343
+#: g10/sign.c:311
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "la comprobaci�n de la firma creada fall�: %s\n"
 
-#: g10/sign.c:352
+#: g10/sign.c:320
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s firma de: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "s�lo puede hacer firmas separadas con claves tipo PGP 2.x estando enmodo --"
 "pgp2\n"
 
-#: g10/sign.c:864
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6063,15 +6088,15 @@ msgstr ""
 "AVISO: forzar el algoritmo de resumen %s (%d) va en contra de las\n"
 "preferencias del destinatario\n"
 
-#: g10/sign.c:991
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:1106
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s�lo puede firmar en claro con claves PGP 2.x estando en modo --pgp2\n"
 
-#: g10/sign.c:1290
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "se usar� un cifrado %s\n"
@@ -6782,64 +6807,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "no se puede acceder a %s - �tarjeta OpenPGP inv�lida?\n"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:114 sm/gpgsm.c:361
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 #, fuzzy
 msgid "read options from file"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "no usa la terminal en absoluto"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:135
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "ver �rdenes de administrador"
 
-#: scd/scdaemon.c:209
+#: scd/scdaemon.c:210
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpgm [opciones] [ficheros] (-h para ayuda)"
 
-#: scd/scdaemon.c:211
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:658
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1006
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1011
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6873,11 +6898,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1631
+#: sm/certchain.c:195 sm/certchain.c:1646
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1631
+#: sm/certchain.c:196 sm/certchain.c:1646
 #, fuzzy
 msgid "shell"
 msgstr "ayuda"
@@ -6918,8 +6943,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "fallo al almacenar la clave: %s\n"
@@ -7098,7 +7123,7 @@ msgstr ""
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1730
+#: sm/certchain.c:1462 sm/certchain.c:1745
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "Revocaci�n de certificado v�lida"
@@ -7115,11 +7140,11 @@ msgstr ""
 "No se ha encontrado ning�n certificado sin valor de confianza.\n"
 "\n"
 
-#: sm/certchain.c:1620
+#: sm/certchain.c:1635
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1629
+#: sm/certchain.c:1644
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7134,7 +7159,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7148,25 +7173,25 @@ msgstr "no"
 msgid "[none]"
 msgstr "[no establecido]"
 
-#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
+#: sm/certdump.c:583 sm/certdump.c:628 sm/certdump.c:693 sm/certdump.c:746
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "Error: respuesta no v�lida.\n"
 
-#: sm/certdump.c:558 sm/certdump.c:603
+#: sm/certdump.c:591 sm/certdump.c:636
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:640 sm/certdump.c:696
+#: sm/certdump.c:673 sm/certdump.c:729
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:665 sm/certdump.c:719
+#: sm/certdump.c:698 sm/certdump.c:752
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "Error: respuesta no v�lida.\n"
 
-#: sm/certdump.c:936
+#: sm/certdump.c:946
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7293,125 +7318,134 @@ msgstr "borrado de bloque de anillo de claves fallido: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(No se di� descripci�n)\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[file]|crea una firma"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[file]|crea una firma en texto claro"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list external keys"
 msgstr "lista claves secretas"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "elimina claves del anillo p�blico"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "register a smartcard"
 msgstr "a�adir clave a tarjeta"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:270
 #, fuzzy
 msgid "change a passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crea una salida ascii con armadura"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "use the default key as default recipient"
 msgstr "usa la clave por defecto como destinatario"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr "no usa la terminal en absoluto"
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:345
+msgid "|FILE|write a server mode log to FILE"
+msgstr ""
+
+#: sm/gpgsm.c:347
+#, fuzzy
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
+
+#: sm/gpgsm.c:349
 msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr "siempre usa un MDC para cifrar"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
@@ -7421,60 +7455,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:353
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr "asume \"s�\" en casi todas las preguntas"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:359
 msgid "add this keyring to the list of keyrings"
 msgstr "a�ade este anillo a la lista de anillos"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:360
 msgid "add this secret keyring to the list"
 msgstr "a�ade este anillo secreto a la lista"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVIDOR|usa este servidor de claves"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:363
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:379
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:388
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:390
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:392
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa el algoritmo de compresi�n N"
 
-#: sm/gpgsm.c:568
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpgm [opciones] [ficheros] (-h para ayuda)"
 
-#: sm/gpgsm.c:571
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7485,36 +7519,36 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: sm/gpgsm.c:650
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpgm [opciones] "
 
-#: sm/gpgsm.c:748
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "no se puede conectar con `%s': %s\n"
 
-#: sm/gpgsm.c:759
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "opci�n desconocida `%s'\n"
 
-#: sm/gpgsm.c:1315
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1411
+#: sm/gpgsm.c:1468
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1429
+#: sm/gpgsm.c:1486
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "no se puede acceder a `%s': %s\n"
 
-#: sm/gpgsm.c:1612
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7537,7 +7571,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "error obteniendo el n�mero de serie: %s\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:1274
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "error leyendo `%s': %s\n"
@@ -7600,17 +7634,17 @@ msgstr "error leyendo `%s': %s\n"
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:111
+#: sm/qualified.c:105
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "Error: formato inv�lido de huella dactilar.\n"
 
-#: sm/qualified.c:129
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:225
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7621,13 +7655,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234 sm/verify.c:536
+#: sm/qualified.c:209 sm/verify.c:580
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:327
+#: sm/qualified.c:277
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7640,292 +7674,310 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "la comprobaci�n de la firma creada fall�: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:424
 #, fuzzy
 msgid "Signature made "
 msgstr "Firmado el %s\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:428
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:429
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "error obteniendo el n�mero de serie: %s\n"
 
-#: sm/verify.c:514
+#: sm/verify.c:558
 #, fuzzy
 msgid "Good signature from"
 msgstr "Firma correcta de \"%s\""
 
-#: sm/verify.c:515
+#: sm/verify.c:559
 #, fuzzy
 msgid "                aka"
 msgstr "                alias \"%s\""
 
-#: sm/verify.c:533
+#: sm/verify.c:577
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "Esto ser� una autofirma.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "fin"
 
-#: tools/gpg-connect-agent.c:60
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:127
+#: tools/gpg-connect-agent.c:74
+#, fuzzy
+msgid "|FILE|run commands from FILE on startup"
+msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
+
+#: tools/gpg-connect-agent.c:75
+msgid "run /subst on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:174
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: tools/gpg-connect-agent.c:130
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:314
+#: tools/gpg-connect-agent.c:1155
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:323
+#: tools/gpg-connect-agent.c:1164
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:381
+#: tools/gpg-connect-agent.c:1219 tools/gpg-connect-agent.c:1645
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "fallo leyendo la clave\n"
+
+#: tools/gpg-connect-agent.c:1299
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "l�nea demasiado larga"
 
-#: tools/gpg-connect-agent.c:385
+#: tools/gpg-connect-agent.c:1303
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:1619
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "opci�n desconocida `%s'\n"
 
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:1637
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: tools/gpg-connect-agent.c:473
-#, fuzzy, c-format
-msgid "receiving line failed: %s\n"
-msgstr "fallo leyendo la clave\n"
-
-#: tools/gpg-connect-agent.c:789
+#: tools/gpg-connect-agent.c:1986
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "error enviando a `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:798
+#: tools/gpg-connect-agent.c:1995
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "error enviando a `%s': %s\n"
 
-#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
-#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
+#: tools/gpgconf-comp.c:459 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:773
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:796
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
-#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
+#: tools/gpgconf-comp.c:482 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:803
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "habilita depuraci�n completa"
 
-#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
-#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:487 tools/gpgconf-comp.c:606 tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:729 tools/gpgconf-comp.c:811
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:737
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:504
+#: tools/gpgconf-comp.c:502
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:506
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:512
+#: tools/gpgconf-comp.c:510
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:526
+#: tools/gpgconf-comp.c:524
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:527
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:531
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:535
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:539
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:543
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|usa modo de contrase�a N"
 
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:547
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:710
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:669
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:674
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:719
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las contrase�as"
 
-#: tools/gpgconf-comp.c:744
+#: tools/gpgconf-comp.c:742
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:786
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:824
+#: tools/gpgconf-comp.c:822
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:834
+#: tools/gpgconf-comp.c:832
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:845
+#: tools/gpgconf-comp.c:843
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:850
+#: tools/gpgconf-comp.c:848
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:887
+#: tools/gpgconf-comp.c:885
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2982
+#: tools/gpgconf-comp.c:3006
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:59
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
+#, fuzzy
+msgid "list global configuration file"
+msgstr "art�culo de configuraci�n desconocido `%s'\n"
+
+#: tools/gpgconf.c:67
 #, fuzzy
 msgid "check global configuration file"
 msgstr "art�culo de configuraci�n desconocido `%s'\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:71
+msgid "use as output file"
+msgstr "usa como fichero de salida"
+
+#: tools/gpgconf.c:75
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:100
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:176 tools/gpgconf.c:209
+#: tools/gpgconf.c:202 tools/gpgconf.c:240
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uso: gpg [opciones] "
 
-#: tools/gpgconf.c:178
+#: tools/gpgconf.c:204
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:187
+#: tools/gpgconf.c:213
 #, fuzzy
 msgid "Component not found"
 msgstr "Clave p�blica no encontrada"
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:242
 #, fuzzy
 msgid "No argument allowed"
 msgstr "No se permiten �rdenes de administrador\n"
@@ -8023,92 +8075,106 @@ msgstr "error leyendo `%s': %s\n"
 msgid "error closing %s: %s\n"
 msgstr "error en `%s': %s\n"
 
-#: tools/symcryptrun.c:515
+#: tools/symcryptrun.c:486
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "no es posible ejecutar programas remotos\n"
 
-#: tools/symcryptrun.c:521
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:556
+#: tools/symcryptrun.c:527
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: tools/symcryptrun.c:563
+#: tools/symcryptrun.c:534
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: tools/symcryptrun.c:579
+#: tools/symcryptrun.c:550
 #, fuzzy, c-format
 msgid "could not fork: %s\n"
 msgstr "%s: usuario no encontrado: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:578
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: tools/symcryptrun.c:636
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "borrado de bloque de anillo de claves fallido: %s\n"
 
-#: tools/symcryptrun.c:653
+#: tools/symcryptrun.c:624
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: tools/symcryptrun.c:705
+#: tools/symcryptrun.c:676
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: tools/symcryptrun.c:757
+#: tools/symcryptrun.c:728
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: tools/symcryptrun.c:771
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:826
+#: tools/symcryptrun.c:797
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "%s: no se puede crear el anillo: %s\n"
 
-#: tools/symcryptrun.c:839
+#: tools/symcryptrun.c:810
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "no se puede crear fichero de respaldo `%s': %s\n"
 
-#: tools/symcryptrun.c:1014
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1041
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1050
+#: tools/symcryptrun.c:1021
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "el resumen protector %d no puede ser utilizado\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "no uede poner datos de notaci�n en claves v3 (estilo PGP 2.x)\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "no puede poner URL de pol�tica en firmas v3 (estilo PGP 2.x)\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "no puede poner URL de pol�tica en firmas de claves v3 (estilo PGP 2.x)\n"
+
 #, fuzzy
 #~ msgid "shelll"
 #~ msgstr "ayuda"
diff --git a/po/et.po b/po/et.po
index 9d48490a4..bcece85d0 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-09-14 13:27+0200\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -14,59 +14,75 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: agent/call-pinentry.c:438
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:441
+#: agent/call-pinentry.c:551
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/call-pinentry.c:489
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+msgid "Quality:"
+msgstr ""
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 #, fuzzy
 msgid "PIN too long"
 msgstr "rida on liiga pikk\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:668
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "liiga pikk parool\n"
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:676
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:535
+#: agent/call-pinentry.c:693
 #, fuzzy
 msgid "Bad PIN"
 msgstr "halb MPI"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:694
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "halb parool"
 
-#: agent/call-pinentry.c:572
+#: agent/call-pinentry.c:730
 #, fuzzy
 msgid "Passphrase"
 msgstr "halb parool"
@@ -76,21 +92,21 @@ msgstr "halb parool"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
-#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1865
-#: sm/gpgsm.c:1902 sm/gpgsm.c:1940 sm/qualified.c:72
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
@@ -130,14 +146,25 @@ msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/command-ssh.c:2349
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "muuda parooli"
+
+#: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2850
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/command-ssh.c:2885
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
@@ -182,76 +209,66 @@ msgstr "Sisestage parool\n"
 msgid "Take this one anyway"
 msgstr "Kasutan seda v�tit ikka? "
 
-#: agent/genkey.c:185
+#: agent/genkey.c:191
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u character long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u characters long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:202
+#: agent/genkey.c:212
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digit or special character."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digits or special characters."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:225
+#: agent/genkey.c:235
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
-"passphrase may not%0Abe a known term or match certain pattern."
+"Warning: You have entered an insecure passphrase.%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:238
+#: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:240
+#: agent/genkey.c:253
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:246
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:290
+#: agent/genkey.c:306
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "muuda parooli"
-
-#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
-#: tools/symcryptrun.c:456
-msgid "does not match - try again"
-msgstr ""
-
-#: agent/genkey.c:412
+#: agent/genkey.c:429
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muuda parooli"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:104
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -261,66 +278,65 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:109
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:69 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:341
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "ole m�nev�rra vaiksem"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:112
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:113
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
-#: tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "otsi v�tmeid v�tmeserverist"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:134
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "uuenda usalduse andmebaasi"
@@ -358,150 +374,165 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:91 tools/symcryptrun.c:204
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Palun saatke veateated aadressil <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:512 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:340 sm/gpgsm.c:819 sm/gpgsm.c:822 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: agent/gpg-agent.c:610 agent/gpg-agent.c:1177 g10/gpg.c:2027
-#: scd/scdaemon.c:421 sm/gpgsm.c:914 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: agent/gpg-agent.c:947 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: agent/gpg-agent.c:1247 agent/gpg-agent.c:1373 agent/gpg-agent.c:1377
-#: agent/gpg-agent.c:1418 agent/gpg-agent.c:1422 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:908
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
+#: agent/gpg-agent.c:1321
+#, c-format
+msgid "socket name `%s' is too long\n"
+msgstr ""
+
+#: agent/gpg-agent.c:1333
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
+#, fuzzy
+msgid "error getting nonce for the socket\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: kataloog on loodud\n"
 
-#: agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1448
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1438
+#: agent/gpg-agent.c:1452
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: kataloogi ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1549
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
+#, fuzzy, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1554
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1571
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1576
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: j�tsin vahele: %s\n"
 
-#: agent/gpg-agent.c:1809
+#: agent/gpg-agent.c:1850
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:756
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 
-#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
-#: tools/gpg-connect-agent.c:767
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
@@ -528,40 +559,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1188
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1191
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/protect-tool.c:1216
+#: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1221
+#: agent/protect-tool.c:1199
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "halb parool"
 
-#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Katkesta"
@@ -673,7 +704,8 @@ msgstr "muuda parooli"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1338
+#: tools/gpgconf-comp.c:1641
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "viga parooli loomisel: %s\n"
@@ -822,77 +854,82 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:366
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr "pakend: %s\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr "vigane pakendi p�is: "
 
-#: g10/armor.c:416
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr "pakendi p�is: "
 
-#: g10/armor.c:427
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr "vigane avateksti allkirja p�is\n"
 
-#: g10/armor.c:479
+#: g10/armor.c:455
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "pakendi p�is: "
+
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr "avateksti allkirjad �ksteise sees\n"
 
-#: g10/armor.c:614
+#: g10/armor.c:643
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "ootamatu pakend:"
 
-#: g10/armor.c:626
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr "vigane kriipsudega m�rgitud rida: "
 
-#: g10/armor.c:780 g10/armor.c:1390
+#: g10/armor.c:809 g10/armor.c:1419
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "vigane radix64 s�mbol %02x vahele j�etud\n"
 
-#: g10/armor.c:823
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr "enneaegne failil�pp (puudub CRC)\n"
 
-#: g10/armor.c:857
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr "enneaegne failil�pp (poolik CRC)\n"
 
-#: g10/armor.c:865
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr "vigane CRC\n"
 
-#: g10/armor.c:869 g10/armor.c:1427
+#: g10/armor.c:898 g10/armor.c:1456
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC viga; %06lx - %06lx\n"
 
-#: g10/armor.c:889
+#: g10/armor.c:918
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "enneaegne failil�pp (l�petaval real)\n"
 
-#: g10/armor.c:893
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr "viga l�petaval real\n"
 
-#: g10/armor.c:1204
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/armor.c:1209
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "vigane pakend: rida on pikem, kui %d s�mbolit\n"
 
-#: g10/armor.c:1213
+#: g10/armor.c:1242
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1237,11 +1274,11 @@ msgstr "kirjutan salajase v�tme faili `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
-#: g10/decrypt.c:110 g10/encode.c:890
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr "v�ti --output ei t��ta selle k�suga\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' ei �nnestu avada\n"
@@ -1252,7 +1289,7 @@ msgstr "`%s' ei �nnestu avada\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1295,7 +1332,7 @@ msgstr "avaliku v�tme \"%s\" jaoks on salajane v�ti!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "selle kustutamiseks kasutage v�tit \"--delete-secret-keys\".\n"
 
-#: g10/encode.c:226 g10/sign.c:1296
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
@@ -1314,7 +1351,7 @@ msgstr "kasutan �iffrit %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "HOIATUS: `%s' on t�hi fail\n"
@@ -1341,7 +1378,7 @@ msgid ""
 msgstr ""
 "s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:669 g10/sign.c:966
+#: g10/encode.c:655 g10/sign.c:936
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1349,18 +1386,18 @@ msgid ""
 msgstr ""
 "pakkimise algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:765
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/encode.c:862
+#: g10/encode.c:848
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s kr�ptitud kasutajale: \"%s\"\n"
@@ -1551,7 +1588,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:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1559,133 +1596,133 @@ msgstr ""
 "@K�sud:\n"
 " "
 
-#: g10/gpg.c:370
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[fail]|loo allkiri"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/gpg.c:372 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "kr�pteeri andmed"
 
-#: g10/gpg.c:375 sm/gpgsm.c:248
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
 
-#: g10/gpg.c:377 sm/gpgsm.c:249
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "dekr�pteeri andmed (vaikimisi)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/gpg.c:381 sm/gpgsm.c:252
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "n�ita v�tmeid"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "n�ita v�tmeid ja allkirju"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontrolli v�tmete allkirju"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "n�ita v�tmeid ja s�rmej�lgi"
 
-#: g10/gpg.c:386 sm/gpgsm.c:254
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "n�ita salajasi v�tmeid"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "remove keys from the public keyring"
 msgstr "eemalda v�tmed avalike v�tmete hoidlast"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "remove keys from the secret keyring"
 msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "allkirjasta v�ti"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "allkirjasta v�i toimeta v�tit"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "genereeri t�histamise sertifikaat"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "ekspordi v�tmed"
 
-#: g10/gpg.c:397 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "ekspordi v�tmed v�tmeserverisse"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "impordi v�tmed v�tmeserverist"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:402
 msgid "search for keys on a key server"
 msgstr "otsi v�tmeid v�tmeserverist"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "update all keys from a keyserver"
 msgstr "uuenda v�tmeid v�tmeserverist"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "impordi/mesti v�tmed"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:410
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr "|algo [failid]|tr�ki teatel�hendid"
 
-#: g10/gpg.c:430 sm/gpgsm.c:264
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1695,47 +1732,48 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:281
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: g10/gpg.c:436 sm/gpgsm.c:293
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|kr�pti NIMEle"
 
-#: g10/gpg.c:447 sm/gpgsm.c:331
+#: g10/gpg.c:449 sm/gpgsm.c:333
 msgid "use this user-id to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/gpg.c:448 sm/gpgsm.c:334
+#: g10/gpg.c:450 sm/gpgsm.c:336
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:336
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
-msgid "use as output file"
-msgstr "kasuta v�ljundfailina"
+#: g10/gpg.c:469 sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "�ra tee mingeid muutusi"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "k�si enne �lekirjutamist"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:524
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:397
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1743,7 +1781,7 @@ msgstr ""
 "@\n"
 "(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:400
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1763,15 +1801,15 @@ msgstr ""
 " --list-keys [nimed]        n�ita v�tmeid\n"
 " --fingerprint [nimed]      n�ita s�rmej�lgi\n"
 
-#: g10/gpg.c:750 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Palun saatke veateated aadressil <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:767
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1781,7 +1819,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:578
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1789,557 +1827,561 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/gpg.c:784
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr "Avalik v�ti: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "�iffer: "
 
-#: g10/gpg.c:798
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr "R�si: "
 
-#: g10/gpg.c:805 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-#: g10/gpg.c:875
+#: g10/gpg.c:817 sm/gpgsm.c:603
+msgid "Used libraries:"
+msgstr ""
+
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:715
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/gpg.c:1063
+#: g10/gpg.c:1113
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
 
-#: g10/gpg.c:1260
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1263
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1266
+#: g10/gpg.c:1316
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1272
+#: g10/gpg.c:1322
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1325
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1328
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1284
+#: g10/gpg.c:1334
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1337
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1340
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1296
+#: g10/gpg.c:1346
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1349
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1352
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1445
+#: g10/gpg.c:1495
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1594
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1602
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1610
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1612
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1825
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1981
+#: g10/gpg.c:2030
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "M�RKUS: ignoreerin vana vaikimisi v�tmete faili `%s'\n"
 
-#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2493
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/gpg.c:2528
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2610
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2613
 msgid "invalid import options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2620
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2551
+#: g10/gpg.c:2623
 msgid "invalid export options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2630
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2561
+#: g10/gpg.c:2633
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2645
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2653
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2655
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2659
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2670
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2673
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2855
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1298
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2975
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 moodis saate luua ainult eraldiseisvaid v�i avateksti allkirju\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 moodis ei saa korraga allkirjastada ja kr�pteerida\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:3014
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1370
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1378
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3092
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3098
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3117
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3119
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 v�i 3\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3121
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "vigane min-sert-tase; peab olema 1, 2 v�i 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3135
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3144
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku �ifri eelistused\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3148
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku l�hendi eelistused\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3152
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3185
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei t��ta veel koos %s-ga\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3232
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�ifri algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3237
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "s�numil�hendi algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3242
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "HOIATUS: m��rati saajad (-r) aga ei kasutata avaliku v�tme kr�ptograafiat\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3375
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3403
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3449
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3454
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3474
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3630
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "v�tme eksport eba�nnestus: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3641
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3651
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4233
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4235
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4268
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -2352,7 +2394,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:75 sm/gpgsm.c:372
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
@@ -2877,13 +2919,13 @@ msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
 msgid "no writable keyring found: %s\n"
 msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2369 g10/import.c:2391
+#: g10/import.c:2381 g10/import.c:2403
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
@@ -2973,7 +3015,7 @@ msgstr "v�ti %08lX: salajane v�ti vigase �ifriga %d - j�tsin vahele\n"
 msgid "importing secret keys not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/import.c:1158 g10/import.c:2384
+#: g10/import.c:1158 g10/import.c:2396
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "puudub salajaste v�tmete vaikimisi v�tmehoidla: %s\n"
@@ -3094,44 +3136,44 @@ msgstr "v�ti %08lX: alamv�tme allkiri on vales kohas - j�tan vahele\n"
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "v�ti %08lX: ootamatu allkirja klass (0x%02x) - j�tan vahele\n"
 
-#: g10/import.c:1732
+#: g10/import.c:1744
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "v�ti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
 
-#: g10/import.c:1794
+#: g10/import.c:1806
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "HOIATUS: v�ti %08lX v�ib olla t�histatud: laen t�histamise v�tit %08lX\n"
 
-#: g10/import.c:1808
+#: g10/import.c:1820
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "HOIATUS: v�ti %08lX v�ib olla t�histatud: t�histamise v�tit %08lX pole.\n"
 
-#: g10/import.c:1867
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat lisatud\n"
 
-#: g10/import.c:1901
+#: g10/import.c:1913
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2302
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "avalik v�ti ei sobi salajase v�tmega!\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2310
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2312
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
@@ -3457,7 +3499,7 @@ msgid "Really sign? (y/N) "
 msgstr "Allkirjastan t�esti? "
 
 #: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:348
+#: g10/keyedit.c:5019 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
@@ -3820,8 +3862,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit t�histada? "
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
 #: g10/keyedit.c:2140
@@ -4699,13 +4740,13 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:273
+#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:275
+#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5303,17 +5344,17 @@ msgstr "Pakkimata"
 msgid "uncompressed|none"
 msgstr "Pakkimata"
 
-#: g10/misc.c:874
+#: g10/misc.c:891
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "see teade ei pruugi olla programmiga %s kasutatav\n"
 
-#: g10/misc.c:1049
+#: g10/misc.c:1066
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/misc.c:1074
+#: g10/misc.c:1091
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
@@ -5372,12 +5413,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:603
+#: g10/passphrase.c:295 g10/passphrase.c:581
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (peamise v�tme ID %08lX)"
 
-#: g10/passphrase.c:327
+#: g10/passphrase.c:309
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5388,24 +5429,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bitti %s v�ti, ID %08lX, loodud %s%s\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:334
 msgid "Repeat passphrase\n"
 msgstr "Korrake parooli\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:336
 msgid "Enter passphrase\n"
 msgstr "Sisestage parool\n"
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:363
 msgid "cancelled by user\n"
 msgstr "katkestatud kasutaja poolt\n"
 
-#: g10/passphrase.c:384 g10/passphrase.c:450
+#: g10/passphrase.c:369 g10/passphrase.c:428
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
-#: g10/passphrase.c:582
+#: g10/passphrase.c:560
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5415,12 +5456,12 @@ msgstr ""
 "Te vajate kasutaja salajase v�tme lahtilukustamiseks\n"
 "parooli: \""
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:568
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bitine %s v�ti, ID %08lX, loodud %s"
 
-#: g10/passphrase.c:599
+#: g10/passphrase.c:577
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6050,30 +6091,14 @@ msgstr "v�ti %08lX: alamv�tme t�histamise paketile puudub alamv�ti\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "v�ti %08lX: alamv�tme allkirjaga sidumiseks puudub alamv�ti\n"
 
-#: g10/sign.c:82
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "noteerimise infot ei saa v3 (PGP 2.x stiilis) allkirja lisada\n"
-
-#: g10/sign.c:90
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "noteerimise infot ei saa v3 (PGP 2.x stiilis) v�tme allkirja lisada\n"
-
-#: g10/sign.c:104
+#: g10/sign.c:89
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "HOIATUS: noteerimise %%-asendus eba�nnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:121
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "poliisi URLi ei saa v3 (PGP 2.x) allkirjadesse panna\n"
-
-#: g10/sign.c:129
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr "poliisi URLi ei saa v3 v�tme (PGP 2.x) allkirjadesse panna\n"
-
-#: g10/sign.c:142
+#: g10/sign.c:115
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6081,7 +6106,7 @@ msgstr ""
 "HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:170
+#: g10/sign.c:138
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6090,38 +6115,38 @@ msgstr ""
 "HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:343
+#: g10/sign.c:311
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 
-#: g10/sign.c:352
+#: g10/sign.c:320
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s allkiri kasutajalt: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x stiilis v�tmetega saab eraldi-allkirjastada ainult --pgp2 moodis\n"
 
-#: g10/sign.c:864
+#: g10/sign.c:834
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/sign.c:991
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "allkirjastan:"
 
-#: g10/sign.c:1106
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x stiilis v�tmetega saab avateksti allkirjastada ainult --pgp2 moodis\n"
 
-#: g10/sign.c:1290
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "kasutatakse %s kr�pteerimist\n"
@@ -6832,64 +6857,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:114 sm/gpgsm.c:361
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 #, fuzzy
 msgid "read options from file"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "�ra kasuta terminali"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:135
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "vastuolulised k�sud\n"
 
-#: scd/scdaemon.c:209
+#: scd/scdaemon.c:210
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: scd/scdaemon.c:211
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:658
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1006
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1011
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6923,11 +6948,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1631
+#: sm/certchain.c:195 sm/certchain.c:1646
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1631
+#: sm/certchain.c:196 sm/certchain.c:1646
 #, fuzzy
 msgid "shell"
 msgstr "help"
@@ -6968,8 +6993,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
@@ -7137,7 +7162,7 @@ msgstr ""
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1730
+#: sm/certchain.c:1462 sm/certchain.c:1745
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "eelistus %c%lu on duplikaat\n"
@@ -7152,11 +7177,11 @@ msgstr "T�histamise sertifikaat on loodud.\n"
 msgid "root certificate is good\n"
 msgstr "halb sertifikaat"
 
-#: sm/certchain.c:1620
+#: sm/certchain.c:1635
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1629
+#: sm/certchain.c:1644
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7171,7 +7196,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7185,25 +7210,25 @@ msgstr "ei"
 msgid "[none]"
 msgstr "tundmatu"
 
-#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
+#: sm/certdump.c:583 sm/certdump.c:628 sm/certdump.c:693 sm/certdump.c:746
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: sm/certdump.c:558 sm/certdump.c:603
+#: sm/certdump.c:591 sm/certdump.c:636
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:640 sm/certdump.c:696
+#: sm/certdump.c:673 sm/certdump.c:729
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:665 sm/certdump.c:719
+#: sm/certdump.c:698 sm/certdump.c:752
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: sm/certdump.c:936
+#: sm/certdump.c:946
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7330,181 +7355,190 @@ msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(Kirjeldust ei antud)\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[fail]|loo allkiri"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list external keys"
 msgstr "n�ita salajasi v�tmeid"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
 #, fuzzy
 msgid "list certificate chain"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "eemalda v�tmed avalike v�tmete hoidlast"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "import certificates"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "export certificates"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:270
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muuda parooli"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "use the default key as default recipient"
 msgstr "kasuta vaikimisi saajana vaikimisi v�tit"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr "�ra kasuta terminali"
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:345
+msgid "|FILE|write a server mode log to FILE"
+msgstr ""
+
+#: sm/gpgsm.c:347
+#, fuzzy
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FAIL|lae laiendusmoodul FAIL"
+
+#: sm/gpgsm.c:349
 msgid "force v3 signatures"
 msgstr "kasuta v3 allkirju"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr "kr�ptimisel kasuta alati MDC"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr "pakettmood: �ra k�si kunagi"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr "eelda enamus k�simustele jah vastust"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr "eelda enamus k�simustele ei vastust"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:359
 msgid "add this keyring to the list of keyrings"
 msgstr "lisa see v�tmehoidla v�tmehoidlate nimekirja"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:360
 msgid "add this secret keyring to the list"
 msgstr "lisa see salajaste v�tmete hoidla nimekirja"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|kasuta seda v�tmeserverit"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:363
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NIMI|terminali kooditabel on NIMI"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:379
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:388
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|kasuta �ifri algoritmi NIMI"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:390
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|kasuta teatel�hendi algoritmi NIMI"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:392
 msgid "|N|use compress algorithm N"
 msgstr "|N|kasuta pakkimisalgoritmi N"
 
-#: sm/gpgsm.c:568
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: sm/gpgsm.c:571
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7515,36 +7549,36 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: sm/gpgsm.c:650
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: sm/gpgsm.c:748
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
 
-#: sm/gpgsm.c:759
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: sm/gpgsm.c:1315
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1411
+#: sm/gpgsm.c:1468
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: sm/gpgsm.c:1429
+#: sm/gpgsm.c:1486
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "`%s' ei �nnestu sulgeda: %s\n"
 
-#: sm/gpgsm.c:1612
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7567,7 +7601,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:1274
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -7630,17 +7664,17 @@ msgstr "viga `%s' lugemisel: %s\n"
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:111
+#: sm/qualified.c:105
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: sm/qualified.c:129
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:225
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7651,13 +7685,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234 sm/verify.c:536
+#: sm/qualified.c:209 sm/verify.c:580
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:327
+#: sm/qualified.c:277
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7670,293 +7704,311 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:424
 #, fuzzy
 msgid "Signature made "
 msgstr "Allkiri aegus %s\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:428
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:429
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/verify.c:514
+#: sm/verify.c:558
 #, fuzzy
 msgid "Good signature from"
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: sm/verify.c:515
+#: sm/verify.c:559
 #, fuzzy
 msgid "                aka"
 msgstr "                 ka \""
 
-#: sm/verify.c:533
+#: sm/verify.c:577
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr ""
 "\n"
 "See saab olema iseenda allkiri.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "v�lju"
 
-#: tools/gpg-connect-agent.c:60
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:127
+#: tools/gpg-connect-agent.c:74
+#, fuzzy
+msgid "|FILE|run commands from FILE on startup"
+msgstr "|FAIL|lae laiendusmoodul FAIL"
+
+#: tools/gpg-connect-agent.c:75
+msgid "run /subst on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:174
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: tools/gpg-connect-agent.c:130
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:314
+#: tools/gpg-connect-agent.c:1155
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:323
+#: tools/gpg-connect-agent.c:1164
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:381
+#: tools/gpg-connect-agent.c:1219 tools/gpg-connect-agent.c:1645
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+
+#: tools/gpg-connect-agent.c:1299
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "rida on liiga pikk\n"
 
-#: tools/gpg-connect-agent.c:385
+#: tools/gpg-connect-agent.c:1303
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:1619
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:1637
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
 
-#: tools/gpg-connect-agent.c:473
-#, fuzzy, c-format
-msgid "receiving line failed: %s\n"
-msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
-
-#: tools/gpg-connect-agent.c:789
+#: tools/gpg-connect-agent.c:1986
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:798
+#: tools/gpg-connect-agent.c:1995
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
-#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
+#: tools/gpgconf-comp.c:459 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:773
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:796
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
-#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
+#: tools/gpgconf-comp.c:482 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:803
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
-#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:487 tools/gpgconf-comp.c:606 tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:729 tools/gpgconf-comp.c:811
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:737
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:504
+#: tools/gpgconf-comp.c:502
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:506
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:512
+#: tools/gpgconf-comp.c:510
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:526
+#: tools/gpgconf-comp.c:524
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:527
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:531
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:535
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:539
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:543
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|kasuta parooli moodi N"
 
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:547
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "viga parooli loomisel: %s\n"
 
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:710
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NIMI|kr�pti NIMEle"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:669
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:674
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:719
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NIMI|kasuta paroolidega �ifri algoritmi NIMI"
 
-#: tools/gpgconf-comp.c:744
+#: tools/gpgconf-comp.c:742
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:786
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:824
+#: tools/gpgconf-comp.c:822
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:834
+#: tools/gpgconf-comp.c:832
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:845
+#: tools/gpgconf-comp.c:843
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:850
+#: tools/gpgconf-comp.c:848
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:887
+#: tools/gpgconf-comp.c:885
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2982
+#: tools/gpgconf-comp.c:3006
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:59
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
+#, fuzzy
+msgid "list global configuration file"
+msgstr "tundmatu seade \"%s\"\n"
+
+#: tools/gpgconf.c:67
 #, fuzzy
 msgid "check global configuration file"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:71
+msgid "use as output file"
+msgstr "kasuta v�ljundfailina"
+
+#: tools/gpgconf.c:75
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:100
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:176 tools/gpgconf.c:209
+#: tools/gpgconf.c:202 tools/gpgconf.c:240
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: tools/gpgconf.c:178
+#: tools/gpgconf.c:204
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:187
+#: tools/gpgconf.c:213
 #, fuzzy
 msgid "Component not found"
 msgstr "ei leia avalikku v�tit"
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:242
 #, fuzzy
 msgid "No argument allowed"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
@@ -8050,92 +8102,105 @@ msgstr "viga `%s' lugemisel: %s\n"
 msgid "error closing %s: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: tools/symcryptrun.c:515
+#: tools/symcryptrun.c:486
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "mittelokaalse programmi k�ivitamist ei toetata\n"
 
-#: tools/symcryptrun.c:521
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:556
+#: tools/symcryptrun.c:527
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: tools/symcryptrun.c:563
+#: tools/symcryptrun.c:534
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: tools/symcryptrun.c:579
+#: tools/symcryptrun.c:550
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:578
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: tools/symcryptrun.c:636
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: tools/symcryptrun.c:653
+#: tools/symcryptrun.c:624
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: tools/symcryptrun.c:705
+#: tools/symcryptrun.c:676
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: tools/symcryptrun.c:757
+#: tools/symcryptrun.c:728
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: tools/symcryptrun.c:771
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:826
+#: tools/symcryptrun.c:797
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: tools/symcryptrun.c:839
+#: tools/symcryptrun.c:810
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: tools/symcryptrun.c:1014
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1041
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1050
+#: tools/symcryptrun.c:1021
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "noteerimise infot ei saa v3 (PGP 2.x stiilis) allkirja lisada\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "noteerimise infot ei saa v3 (PGP 2.x stiilis) v�tme allkirja lisada\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "poliisi URLi ei saa v3 (PGP 2.x) allkirjadesse panna\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr "poliisi URLi ei saa v3 v�tme (PGP 2.x) allkirjadesse panna\n"
+
 #, fuzzy
 #~ msgid "shelll"
 #~ msgstr "help"
diff --git a/po/fi.po b/po/fi.po
index 299b90f1e..33c6c4a06 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-09-14 13:27+0200\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -30,59 +30,75 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: agent/call-pinentry.c:438
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:441
+#: agent/call-pinentry.c:551
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/call-pinentry.c:489
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+msgid "Quality:"
+msgstr ""
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 #, fuzzy
 msgid "PIN too long"
 msgstr "rivi on liian pitkä\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:668
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "salasana on liian pitkä\n"
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:676
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:535
+#: agent/call-pinentry.c:693
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI ei kelpaa"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:694
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "väärä salasana"
 
-#: agent/call-pinentry.c:572
+#: agent/call-pinentry.c:730
 #, fuzzy
 msgid "Passphrase"
 msgstr "väärä salasana"
@@ -92,21 +108,21 @@ msgstr "väärä salasana"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
-#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1865
-#: sm/gpgsm.c:1902 sm/gpgsm.c:1940 sm/qualified.c:72
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
@@ -146,14 +162,25 @@ msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/command-ssh.c:2349
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "muuta salasanaa"
+
+#: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2850
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/command-ssh.c:2885
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
@@ -198,76 +225,66 @@ msgstr "Syötä salasana\n"
 msgid "Take this one anyway"
 msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
 
-#: agent/genkey.c:185
+#: agent/genkey.c:191
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u character long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u characters long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:202
+#: agent/genkey.c:212
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digit or special character."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digits or special characters."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:225
+#: agent/genkey.c:235
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
-"passphrase may not%0Abe a known term or match certain pattern."
+"Warning: You have entered an insecure passphrase.%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:238
+#: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:240
+#: agent/genkey.c:253
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:246
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:290
+#: agent/genkey.c:306
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "muuta salasanaa"
-
-#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
-#: tools/symcryptrun.c:456
-msgid "does not match - try again"
-msgstr ""
-
-#: agent/genkey.c:412
+#: agent/genkey.c:429
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:104
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -277,66 +294,65 @@ msgstr ""
 "Valitsimet:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:109
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:69 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "monisanainen"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:341
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "ole jonkinverran hiljaisempi"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:112
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:113
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
-#: tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:134
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "päivitä luottamustietokanta"
@@ -374,151 +390,166 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:91 tools/symcryptrun.c:204
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:512 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:340 sm/gpgsm.c:819 sm/gpgsm.c:822 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: agent/gpg-agent.c:610 agent/gpg-agent.c:1177 g10/gpg.c:2027
-#: scd/scdaemon.c:421 sm/gpgsm.c:914 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: agent/gpg-agent.c:947 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1247 agent/gpg-agent.c:1373 agent/gpg-agent.c:1377
-#: agent/gpg-agent.c:1418 agent/gpg-agent.c:1422 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:908
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
+#: agent/gpg-agent.c:1321
+#, c-format
+msgid "socket name `%s' is too long\n"
+msgstr ""
+
+#: agent/gpg-agent.c:1333
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
+#, fuzzy
+msgid "error getting nonce for the socket\n"
+msgstr "virhe luotaessa salasanaa: %s\n"
+
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: hakemisto luotu\n"
 
-#: agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1448
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1438
+#: agent/gpg-agent.c:1452
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: hakemistoa ei voi luoda: %s\n"
 
-#: agent/gpg-agent.c:1549
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
+#, fuzzy, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
+
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1554
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1571
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1576
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ohitettu: %s\n"
 
-#: agent/gpg-agent.c:1809
+#: agent/gpg-agent.c:1850
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:756
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
 
-#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
-#: tools/gpg-connect-agent.c:767
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
@@ -545,40 +576,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1188
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1191
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/protect-tool.c:1216
+#: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1221
+#: agent/protect-tool.c:1199
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "väärä salasana"
 
-#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Peru"
@@ -690,7 +721,8 @@ msgstr "muuta salasanaa"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1338
+#: tools/gpgconf-comp.c:1641
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
@@ -839,77 +871,82 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:366
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr "ascii-koodaus: %s\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr "epäkelpo ascii-koodausotsake: "
 
-#: g10/armor.c:416
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr "ascii-koodausotsake: "
 
-#: g10/armor.c:427
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr "epäkelpo selkotekstisen allekirjoituksen otsikko\n"
 
-#: g10/armor.c:479
+#: g10/armor.c:455
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "ascii-koodausotsake: "
+
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr "sisäkkäisiä tekstimuotoisia allekirjoituksia\n"
 
-#: g10/armor.c:614
+#: g10/armor.c:643
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "odottamaton ascii-koodaus:"
 
-#: g10/armor.c:626
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr "epäkelpo viiva rivin lopussa: "
 
-#: g10/armor.c:780 g10/armor.c:1390
+#: g10/armor.c:809 g10/armor.c:1419
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
 
-#: g10/armor.c:823
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr "ennenaikainen tiedoston loppu (ei CRC:tä)\n"
 
-#: g10/armor.c:857
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr "ennenaikainen tiedoston loppu (CRC:ssä)\n"
 
-#: g10/armor.c:865
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr "väärinmuotoiltu CRC\n"
 
-#: g10/armor.c:869 g10/armor.c:1427
+#: g10/armor.c:898 g10/armor.c:1456
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-virhe; %06lx - %06lx\n"
 
-#: g10/armor.c:889
+#: g10/armor.c:918
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "Ennenaikainen tiedoston loppu (Trailerissa)\n"
 
-#: g10/armor.c:893
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr "virhe trailer-rivissä\n"
 
-#: g10/armor.c:1204
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/armor.c:1209
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "epäkelpo ascii-koodaus: yli %d merkkiä pitkä rivi\n"
 
-#: g10/armor.c:1213
+#: g10/armor.c:1242
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1256,11 +1293,11 @@ msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
-#: g10/decrypt.c:110 g10/encode.c:890
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
@@ -1271,7 +1308,7 @@ msgstr "tiedostoa \"%s\" ei voi avata\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1314,7 +1351,7 @@ msgstr "julkiselle avaimelle \"%s\" löytyy vastaava salainen avain!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "käytä valitsinta \"--delete-secret-keys\" poistaaksesi se ensin.\n"
 
-#: g10/encode.c:226 g10/sign.c:1296
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
@@ -1333,7 +1370,7 @@ msgstr "käytetään salakirjoitusalgoritmia %s\n"
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROITUS: \"%s\" on tyhjä tiedosto\n"
@@ -1359,24 +1396,24 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encode.c:669 g10/sign.c:966
+#: g10/encode.c:655 g10/sign.c:936
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "valittu pakkausalgoritmi %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encode.c:765
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/encode.c:862
+#: g10/encode.c:848
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s salattu vastaanottajalle: \"%s\"\n"
@@ -1570,7 +1607,7 @@ msgstr ""
 "avain %08lX: salaisella avaimella ei ole vastaavaa \n"
 "julkista avainta - ohitetaan\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1578,133 +1615,133 @@ msgstr ""
 "@Komennot:\n"
 " "
 
-#: g10/gpg.c:370
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[tiedosto]|tee allekirjoitus"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
 
-#: g10/gpg.c:372 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "salaa tiedot"
 
-#: g10/gpg.c:375 sm/gpgsm.c:248
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr "salaa vain symmetrisellä salaimella"
 
-#: g10/gpg.c:377 sm/gpgsm.c:249
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "avaa tiedot (oletus)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "tarkista allekirjoitus"
 
-#: g10/gpg.c:381 sm/gpgsm.c:252
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "näytä avaimet"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "näytä avaimet allekirjoituksineen"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tarkista avainten allekirjoitukset"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "näytä avaimet sormenjälkineen"
 
-#: g10/gpg.c:386 sm/gpgsm.c:254
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "näytä salaiset avaimet"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "remove keys from the public keyring"
 msgstr "poista avaimet julkisten avainten renkaasta"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "remove keys from the secret keyring"
 msgstr "poista avaimet salaisten avainten renkaasta"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "allekirjoita avain"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "allekirjoita tai muokkaa avainta"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "vie avaimia"
 
-#: g10/gpg.c:397 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "vie avaimia palvelimelle"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "nouda avaimia avainpalvelimelta"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:402
 msgid "search for keys on a key server"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "update all keys from a keyserver"
 msgstr "päivitä kaikki avaimet avainpalvelimelta"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "nouda/liitä avaimia"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:410
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr "päivitä luottamustietokanta"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#: g10/gpg.c:430 sm/gpgsm.c:264
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1714,47 +1751,48 @@ msgstr ""
 "Valitsimet:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:281
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: g10/gpg.c:436 sm/gpgsm.c:293
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: g10/gpg.c:447 sm/gpgsm.c:331
+#: g10/gpg.c:449 sm/gpgsm.c:333
 msgid "use this user-id to sign or decrypt"
 msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
 
-#: g10/gpg.c:448 sm/gpgsm.c:334
+#: g10/gpg.c:450 sm/gpgsm.c:336
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:336
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr "käytä tekstimuotoa"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
-msgid "use as output file"
-msgstr "käytä tulostustiedostona"
+#: g10/gpg.c:469 sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "älä tee muutoksia"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "kysy ennen ylikirjoittamista"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:524
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:397
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1763,7 +1801,7 @@ msgstr ""
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:400
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1782,16 +1820,16 @@ msgstr ""
 " --list-keys [nimet]        näytä avaimet\n"
 " --fingerprint [nimet]      näytä sormenjäljet\n"
 
-#: g10/gpg.c:750 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:767
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1801,7 +1839,7 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:578
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1809,558 +1847,562 @@ msgstr ""
 "\n"
 "Tuetut algoritmit:\n"
 
-#: g10/gpg.c:784
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Salaus: "
 
-#: g10/gpg.c:798
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/gpg.c:805 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Pakkaus: "
 
-#: g10/gpg.c:875
+#: g10/gpg.c:817 sm/gpgsm.c:603
+msgid "Used libraries:"
+msgstr ""
+
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:715
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/gpg.c:1063
+#: g10/gpg.c:1113
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=-merkkiä ei löytynyt ryhmämäärityksessä \"%s\"\n"
 
-#: g10/gpg.c:1260
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1263
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1266
+#: g10/gpg.c:1316
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1272
+#: g10/gpg.c:1322
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1325
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1328
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1284
+#: g10/gpg.c:1334
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1337
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1340
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1296
+#: g10/gpg.c:1346
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1349
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1352
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1445
+#: g10/gpg.c:1495
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1594
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1602
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1610
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1612
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1825
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1981
+#: g10/gpg.c:2030
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
 
-#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
 
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2493
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/gpg.c:2528
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2610
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2613
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2620
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2551
+#: g10/gpg.c:2623
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2630
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2561
+#: g10/gpg.c:2633
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2645
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2653
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2655
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2659
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2670
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2673
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2855
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1298
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2975
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "erillisen allekirjoituksen voi luoda vain --pgp2-tilassa\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2-tilassa ei voi allekirjoittaa ja salata samanaikaisesti\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "sinun tulee käyttää tiedostoja (eikä putkitusta) kun --pgp2 on käytössä.\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:3014
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1370
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1378
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3092
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3098
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3117
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth tulee olla välillä 1-255\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3119
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level ei kelpaa; täytyy olla 0, 1, 2 tai 3\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3121
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level ei kelpaa; täytyy olla 1, 2 tai 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 "HUOM: yksinkertaista S2K-tilaa (0) ei todellakaan suositella käytettäväksi\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3135
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3144
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3148
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3152
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3185
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3232
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3237
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "tiivistealgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3242
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pakkausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROITUS: vastaanottajia (-r) annettu käyttämättä julkisen avaimen salausta\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3375
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3403
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3449
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3454
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3474
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key käyttäjätunnus"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key käyttäjätunnus [komennot]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3630
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3641
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3651
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4233
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4235
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4268
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@ -2373,7 +2415,7 @@ msgstr "ota avaimet tästä avainrenkaasta"
 msgid "make timestamp conflicts only a warning"
 msgstr "käsittele aikaleimakonfliktit pelkkinä varoituksina"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:372
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
 
@@ -2907,13 +2949,13 @@ msgstr "avain %08lX: uusi avain - ohitetaan\n"
 msgid "no writable keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2369 g10/import.c:2391
+#: g10/import.c:2381 g10/import.c:2403
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
@@ -3003,7 +3045,7 @@ msgstr "avain %08lX: avaimella on epäkelpo salain %d - ohitetaan\n"
 msgid "importing secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/import.c:1158 g10/import.c:2384
+#: g10/import.c:1158 g10/import.c:2396
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "salaiselle avainrenkaalle ei ole asetettu oletusarvoa: %s\n"
@@ -3125,45 +3167,45 @@ msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "avain %08lX: odottamaton allekirjoitusluokka (0x%02X) - ohitetaan\n"
 
-#: g10/import.c:1732
+#: g10/import.c:1744
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "avain %08lX: käyttäjätunnuksen kaksoiskappale havaittu - liitetty\n"
 
-#: g10/import.c:1794
+#: g10/import.c:1806
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROITUS: avain %08lX saattaa olla mitätöity: haetaan mitätöintiavain %08lX\n"
 
-#: g10/import.c:1808
+#: g10/import.c:1820
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "VAROITUS: avain %08lX saattaa olla mitätöity: mitätöintiavainta %08lX \n"
 "ei saatavilla.\n"
 
-#: g10/import.c:1867
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n"
 
-#: g10/import.c:1901
+#: g10/import.c:1913
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2302
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "julkinen avain ei täsmää salaiseen avaimeen!\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2310
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2312
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
@@ -3492,7 +3534,7 @@ msgid "Really sign? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
 #: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:348
+#: g10/keyedit.c:5019 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
@@ -3855,8 +3897,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
 #: g10/keyedit.c:2140
@@ -4740,7 +4781,7 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:273
+#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4748,7 +4789,7 @@ msgstr ""
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:275
+#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5357,17 +5398,17 @@ msgstr "pakkaamaton"
 msgid "uncompressed|none"
 msgstr "pakkaamaton"
 
-#: g10/misc.c:874
+#: g10/misc.c:891
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "%s ei kenties voi käsitellä tätä viestiä\n"
 
-#: g10/misc.c:1049
+#: g10/misc.c:1066
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/misc.c:1074
+#: g10/misc.c:1091
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
@@ -5426,12 +5467,12 @@ msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:603
+#: g10/passphrase.c:295 g10/passphrase.c:581
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (pääavaimen tunnus %08lX)"
 
-#: g10/passphrase.c:327
+#: g10/passphrase.c:309
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5442,24 +5483,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:334
 msgid "Repeat passphrase\n"
 msgstr "Toista salasana\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:336
 msgid "Enter passphrase\n"
 msgstr "Syötä salasana\n"
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:363
 msgid "cancelled by user\n"
 msgstr "käyttäjän peruma\n"
 
-#: g10/passphrase.c:384 g10/passphrase.c:450
+#: g10/passphrase.c:369 g10/passphrase.c:428
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
 
-#: g10/passphrase.c:582
+#: g10/passphrase.c:560
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5468,12 +5509,12 @@ msgstr ""
 "\n"
 "Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle: \""
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:568
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s"
 
-#: g10/passphrase.c:599
+#: g10/passphrase.c:577
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6118,35 +6159,14 @@ msgstr "avain %08lX: ei vastaavaa aliavainta aliavaimen mitätöintipaketille\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "avain %08lX: ei aliavainta aliavaimen liitosallekirjoitukselle\n"
 
-#: g10/sign.c:82
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"notaatiodataa ei voi laittaa v3-allekirjoituksiin (PGP 2.x -tyyliset)\n"
-
-#: g10/sign.c:90
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-"notaatiodataa ei voi laittaa v3-avainallekirjoituksiin (PGP 2.x -tyyliset)\n"
-
-#: g10/sign.c:104
+#: g10/sign.c:89
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "VAROITUS: %%-laajennus ei onnistu (liian suuri).  Käytetään "
 "laajentamatonta.\n"
 
-#: g10/sign.c:121
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"käytäntö-URL:ia ei voi laittaa v3-allekirjoituksiin (PGP 2.x -tyyliset)\n"
-
-#: g10/sign.c:129
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-"käytäntö-URL:ia ei voi laittaa v3-avainallekirjoituksiin (PGP 2.x -"
-"tyyliset)\n"
-
-#: g10/sign.c:142
+#: g10/sign.c:115
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6154,7 +6174,7 @@ msgstr ""
 "VAROITUS: käytäntö-url:n %%-laajennus ei onnistu (liian suuri). \n"
 "Käytetään laajentamatonta.\n"
 
-#: g10/sign.c:170
+#: g10/sign.c:138
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6163,40 +6183,40 @@ msgstr ""
 "VAROITUS: käytäntö-url:n %%-laajennus ei onnistu (liian suuri). \n"
 "Käytetään laajentamatonta.\n"
 
-#: g10/sign.c:343
+#: g10/sign.c:311
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: g10/sign.c:352
+#: g10/sign.c:320
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s-allekirjoitus lähettäjältä: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "voit tehdä erillisiä allekirjoituksia PGP 2.x -muodon avaimilla \n"
 "vain --pgp2-tilassa\n"
 
-#: g10/sign.c:864
+#: g10/sign.c:834
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
 
-#: g10/sign.c:991
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "allekirjoitetaan:"
 
-#: g10/sign.c:1106
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x -muodon avaimilla voi allekirjoittaa tekstimuotoon \n"
 "vain --pgp2-tilassa\n"
 
-#: g10/sign.c:1290
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "käytetään %s-salausta\n"
@@ -6911,64 +6931,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:114 sm/gpgsm.c:361
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 #, fuzzy
 msgid "read options from file"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "älä käytä lainkaan päätettä"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:135
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "ristiriitainen komento\n"
 
-#: scd/scdaemon.c:209
+#: scd/scdaemon.c:210
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: scd/scdaemon.c:211
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:658
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1006
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1011
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7002,11 +7022,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1631
+#: sm/certchain.c:195 sm/certchain.c:1646
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1631
+#: sm/certchain.c:196 sm/certchain.c:1646
 #, fuzzy
 msgid "shell"
 msgstr "apua"
@@ -7047,8 +7067,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
@@ -7216,7 +7236,7 @@ msgstr ""
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1730
+#: sm/certchain.c:1462 sm/certchain.c:1745
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "valinta %c%lu on kopio\n"
@@ -7231,11 +7251,11 @@ msgstr "Mitätöintivarmenne luotu.\n"
 msgid "root certificate is good\n"
 msgstr "virheellinen varmenne"
 
-#: sm/certchain.c:1620
+#: sm/certchain.c:1635
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1629
+#: sm/certchain.c:1644
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7250,7 +7270,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7264,25 +7284,25 @@ msgstr "ei"
 msgid "[none]"
 msgstr "tuntematon "
 
-#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
+#: sm/certdump.c:583 sm/certdump.c:628 sm/certdump.c:693 sm/certdump.c:746
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: sm/certdump.c:558 sm/certdump.c:603
+#: sm/certdump.c:591 sm/certdump.c:636
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:640 sm/certdump.c:696
+#: sm/certdump.c:673 sm/certdump.c:729
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:665 sm/certdump.c:719
+#: sm/certdump.c:698 sm/certdump.c:752
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: sm/certdump.c:936
+#: sm/certdump.c:946
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7409,181 +7429,190 @@ msgstr "avainlohkojen poisto epäonnistui: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(Kuvausta ei annettu)\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[tiedosto]|tee allekirjoitus"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list external keys"
 msgstr "näytä salaiset avaimet"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
 #, fuzzy
 msgid "list certificate chain"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "poista avaimet julkisten avainten renkaasta"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "import certificates"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "export certificates"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:270
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muuta salasanaa"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "use the default key as default recipient"
 msgstr "käytä oletusavainta oletusvastaanottajana"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr "älä käytä lainkaan päätettä"
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:345
+msgid "|FILE|write a server mode log to FILE"
+msgstr ""
+
+#: sm/gpgsm.c:347
+#, fuzzy
+msgid "|FILE|write an audit log to FILE"
+msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
+
+#: sm/gpgsm.c:349
 msgid "force v3 signatures"
 msgstr "käytä aina v3-allekirjoituksia"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr "käytä aina MDC:tä salaamiseen"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr "eräajo: älä kysy mitään"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr "oleta myönteinen vastaust useimpiin kysymyksiin"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr "oleta kielteinen vastaust useimpiin kysymyksiin"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:359
 msgid "add this keyring to the list of keyrings"
 msgstr "lisää tämä avainrengas avainrenkaiden luetteloon"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:360
 msgid "add this secret keyring to the list"
 msgstr "lisää tämä salainen avainrengas luetteloon"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|PALVELIN|käytä tätä palvelinta avainten etsimiseen"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:363
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NIMI|aseta päätteen merkistöksi NIMI"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:379
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:388
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|käytä salausalgoritmia NIMI"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:390
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|käytä viestintiivistealgoritmia NIMI"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:392
 msgid "|N|use compress algorithm N"
 msgstr "|N|käytä pakkausalgoritmia N"
 
-#: sm/gpgsm.c:568
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: sm/gpgsm.c:571
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7594,36 +7623,36 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: sm/gpgsm.c:650
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: sm/gpgsm.c:748
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
 
-#: sm/gpgsm.c:759
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: sm/gpgsm.c:1315
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1411
+#: sm/gpgsm.c:1468
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: sm/gpgsm.c:1429
+#: sm/gpgsm.c:1486
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: sm/gpgsm.c:1612
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7646,7 +7675,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:1274
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -7709,17 +7738,17 @@ msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:111
+#: sm/qualified.c:105
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: sm/qualified.c:129
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:225
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7730,13 +7759,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234 sm/verify.c:536
+#: sm/qualified.c:209 sm/verify.c:580
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:327
+#: sm/qualified.c:277
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7749,293 +7778,311 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:424
 #, fuzzy
 msgid "Signature made "
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:428
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:429
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/verify.c:514
+#: sm/verify.c:558
 #, fuzzy
 msgid "Good signature from"
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: sm/verify.c:515
+#: sm/verify.c:559
 #, fuzzy
 msgid "                aka"
 msgstr "                aka \""
 
-#: sm/verify.c:533
+#: sm/verify.c:577
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr ""
 "\n"
 "Tämä tulee olemaan oma-allekirjoitus.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "lopeta|sulje"
 
-#: tools/gpg-connect-agent.c:60
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:127
+#: tools/gpg-connect-agent.c:74
+#, fuzzy
+msgid "|FILE|run commands from FILE on startup"
+msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
+
+#: tools/gpg-connect-agent.c:75
+msgid "run /subst on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:174
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: tools/gpg-connect-agent.c:130
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:314
+#: tools/gpg-connect-agent.c:1155
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:323
+#: tools/gpg-connect-agent.c:1164
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:381
+#: tools/gpg-connect-agent.c:1219 tools/gpg-connect-agent.c:1645
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "avainlohkojen poisto epäonnistui: %s\n"
+
+#: tools/gpg-connect-agent.c:1299
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "rivi on liian pitkä\n"
 
-#: tools/gpg-connect-agent.c:385
+#: tools/gpg-connect-agent.c:1303
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:1619
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:1637
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: tools/gpg-connect-agent.c:473
-#, fuzzy, c-format
-msgid "receiving line failed: %s\n"
-msgstr "avainlohkojen poisto epäonnistui: %s\n"
-
-#: tools/gpg-connect-agent.c:789
+#: tools/gpg-connect-agent.c:1986
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: tools/gpg-connect-agent.c:798
+#: tools/gpg-connect-agent.c:1995
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
-#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
+#: tools/gpgconf-comp.c:459 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:773
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:796
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
-#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
+#: tools/gpgconf-comp.c:482 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:803
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
-#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:487 tools/gpgconf-comp.c:606 tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:729 tools/gpgconf-comp.c:811
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:737
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:504
+#: tools/gpgconf-comp.c:502
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:506
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:512
+#: tools/gpgconf-comp.c:510
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:526
+#: tools/gpgconf-comp.c:524
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:527
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:531
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:535
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:539
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:543
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|käytä salasanoissa toimintatapaa N"
 
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:547
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:710
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:669
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:674
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:719
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NIMI|käytä salasanoihin salausalgoritmia NIMI"
 
-#: tools/gpgconf-comp.c:744
+#: tools/gpgconf-comp.c:742
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:786
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:824
+#: tools/gpgconf-comp.c:822
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:834
+#: tools/gpgconf-comp.c:832
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:845
+#: tools/gpgconf-comp.c:843
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:850
+#: tools/gpgconf-comp.c:848
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:887
+#: tools/gpgconf-comp.c:885
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2982
+#: tools/gpgconf-comp.c:3006
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:59
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
+#, fuzzy
+msgid "list global configuration file"
+msgstr "tuntematon asetus \"%s\"\n"
+
+#: tools/gpgconf.c:67
 #, fuzzy
 msgid "check global configuration file"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:71
+msgid "use as output file"
+msgstr "käytä tulostustiedostona"
+
+#: tools/gpgconf.c:75
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:100
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:176 tools/gpgconf.c:209
+#: tools/gpgconf.c:202 tools/gpgconf.c:240
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: tools/gpgconf.c:178
+#: tools/gpgconf.c:204
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:187
+#: tools/gpgconf.c:213
 #, fuzzy
 msgid "Component not found"
 msgstr "julkista avainta ei löydy"
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:242
 #, fuzzy
 msgid "No argument allowed"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
@@ -8129,92 +8176,110 @@ msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 msgid "error closing %s: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: tools/symcryptrun.c:515
+#: tools/symcryptrun.c:486
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "etäohjelman suorittamista ei tueta\n"
 
-#: tools/symcryptrun.c:521
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:556
+#: tools/symcryptrun.c:527
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: tools/symcryptrun.c:563
+#: tools/symcryptrun.c:534
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: tools/symcryptrun.c:579
+#: tools/symcryptrun.c:550
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:578
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: tools/symcryptrun.c:636
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: tools/symcryptrun.c:653
+#: tools/symcryptrun.c:624
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: tools/symcryptrun.c:705
+#: tools/symcryptrun.c:676
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: tools/symcryptrun.c:757
+#: tools/symcryptrun.c:728
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: tools/symcryptrun.c:771
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:826
+#: tools/symcryptrun.c:797
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: tools/symcryptrun.c:839
+#: tools/symcryptrun.c:810
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: tools/symcryptrun.c:1014
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1041
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1050
+#: tools/symcryptrun.c:1021
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "notaatiodataa ei voi laittaa v3-allekirjoituksiin (PGP 2.x -tyyliset)\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "notaatiodataa ei voi laittaa v3-avainallekirjoituksiin (PGP 2.x -"
+#~ "tyyliset)\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "käytäntö-URL:ia ei voi laittaa v3-allekirjoituksiin (PGP 2.x -tyyliset)\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "käytäntö-URL:ia ei voi laittaa v3-avainallekirjoituksiin (PGP 2.x -"
+#~ "tyyliset)\n"
+
 #, fuzzy
 #~ msgid "shelll"
 #~ msgstr "apua"
diff --git a/po/fr.po b/po/fr.po
index b222d6a08..8a28c45c5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-09-14 13:27+0200\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
 "PO-Revision-Date: 2005-06-28 00:24+0200\n"
 "Last-Translator: Ga�l Qu�ri <gael@lautre.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -19,59 +19,76 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "impossible de stocker l'empreinte: %s\n"
 
-#: agent/call-pinentry.c:438
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:441
+#: agent/call-pinentry.c:551
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: agent/call-pinentry.c:489
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+#, fuzzy
+msgid "Quality:"
+msgstr "validit�: %s"
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 #, fuzzy
 msgid "PIN too long"
 msgstr "ligne trop longue"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:668
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "ligne trop longue"
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:676
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:535
+#: agent/call-pinentry.c:693
 #, fuzzy
 msgid "Bad PIN"
 msgstr "mauvais entier en pr�cision multiple (MPI)"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:694
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "mauvaise phrase de passe"
 
-#: agent/call-pinentry.c:572
+#: agent/call-pinentry.c:730
 #, fuzzy
 msgid "Passphrase"
 msgstr "mauvaise phrase de passe"
@@ -81,21 +98,21 @@ msgstr "mauvaise phrase de passe"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "le hachage de protection %d n'est pas support�\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
-#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1865
-#: sm/gpgsm.c:1902 sm/gpgsm.c:1940 sm/qualified.c:72
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
@@ -138,14 +155,25 @@ msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: agent/command-ssh.c:2349
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "changer la phrase de passe"
+
+#: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2850
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/command-ssh.c:2885
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: la cr�ation de la table de hachage a �chou�: %s\n"
@@ -192,53 +220,53 @@ msgstr "Entrez la phrase de passe\n"
 msgid "Take this one anyway"
 msgstr "Utiliser cette cl� quand m�me ? (o/N) "
 
-#: agent/genkey.c:185
+#: agent/genkey.c:191
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u character long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u characters long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:202
+#: agent/genkey.c:212
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digit or special character."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digits or special characters."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:225
+#: agent/genkey.c:235
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
-"passphrase may not%0Abe a known term or match certain pattern."
+"Warning: You have entered an insecure passphrase.%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:238
+#: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:240
+#: agent/genkey.c:253
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:246
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:290
+#: agent/genkey.c:306
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
@@ -246,23 +274,13 @@ msgstr ""
 "secr�te.\n"
 "\n"
 
-#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "changer la phrase de passe"
-
-#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
-#: tools/symcryptrun.c:456
-msgid "does not match - try again"
-msgstr ""
-
-#: agent/genkey.c:412
+#: agent/genkey.c:429
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "changer la phrase de passe"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:104
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -272,68 +290,67 @@ msgstr ""
 "Options:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:109
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:69 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "bavard"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:341
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:112
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:113
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "lire les options de `%s'\n"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
-#: tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "chercher les cl�s avec un serveur de cl�s"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:134
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "indiquer la liste des pr�f�rences pour le nom d'utilisateur\n"
 "s�lectionn�"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "mettre la base de confiance � jour"
@@ -371,154 +388,169 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:91 tools/symcryptrun.c:204
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
 "Signaler toutes anomalies � <gnupg-bugs@gnu.org> (en anglais)\n"
 "et tout probl�me de traduction � <traduc@traduc.org>.\n"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:512 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:340 sm/gpgsm.c:819 sm/gpgsm.c:822 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, 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:610 agent/gpg-agent.c:1177 g10/gpg.c:2027
-#: scd/scdaemon.c:421 sm/gpgsm.c:914 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: agent/gpg-agent.c:947 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erreur pendant la cr�ation de `%s': %s\n"
 
-#: agent/gpg-agent.c:1247 agent/gpg-agent.c:1373 agent/gpg-agent.c:1377
-#: agent/gpg-agent.c:1418 agent/gpg-agent.c:1422 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:908
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "impossible de cr�er le r�pertoire `%s': %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
+#: agent/gpg-agent.c:1321
+#, c-format
+msgid "socket name `%s' is too long\n"
+msgstr ""
+
+#: agent/gpg-agent.c:1333
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent n'est pas disponible dans cette session\n"
 
-#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
+#, fuzzy
+msgid "error getting nonce for the socket\n"
+msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
+
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr ""
 "erreur pendant la recherche de l'enregistrement de confiance\n"
 "dans `%s': %s\n"
 
-#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "�criture de la cl� secr�te dans `%s'\n"
 
-#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "r�pertoire `%s' cr��\n"
 
-#: agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1448
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) �chou� dans %s: %s\n"
 
-#: agent/gpg-agent.c:1438
+#: agent/gpg-agent.c:1452
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "impossible de cr�er le r�pertoire `%s': %s\n"
 
-#: agent/gpg-agent.c:1549
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
+#, fuzzy, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "erreur pendant la lecture de `%s': %s\n"
+
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1554
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1571
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1576
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
 
-#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignor�: %s\n"
 
-#: agent/gpg-agent.c:1809
+#: agent/gpg-agent.c:1850
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent n'est pas disponible dans cette session\n"
 
-#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:756
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'environnement GPG_AGENT_INFO est mal d�finie\n"
 
-#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
-#: tools/gpg-connect-agent.c:767
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "le protocole gpg-agent version %d n'est pas support�\n"
@@ -545,40 +577,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1188
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1191
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: agent/protect-tool.c:1216
+#: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1221
+#: agent/protect-tool.c:1199
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "mauvaise phrase de passe"
 
-#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "annul�"
@@ -690,7 +722,8 @@ msgstr "changer la phrase de passe"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1338
+#: tools/gpgconf-comp.c:1641
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
@@ -843,75 +876,80 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:366
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr "armure: %s\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr "en-t�te d'armure invalide: "
 
-#: g10/armor.c:416
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr "en-t�te d'armure: "
 
-#: g10/armor.c:427
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr "en-t�te de signature claire invalide\n"
 
-#: g10/armor.c:479
+#: g10/armor.c:455
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "en-t�te d'armure: "
+
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr "signatures en texte clair imbriqu�es\n"
 
-#: g10/armor.c:614
+#: g10/armor.c:643
 msgid "unexpected armor: "
 msgstr "armure inattendue: "
 
-#: g10/armor.c:626
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr "ligne �chapp�e par `-' invalide: "
 
-#: g10/armor.c:780 g10/armor.c:1390
+#: g10/armor.c:809 g10/armor.c:1419
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caract�re %02X invalide en radix64 ignor�\n"
 
-#: g10/armor.c:823
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr "fin de fichier pr�matur�e (pas de CRC)\n"
 
-#: g10/armor.c:857
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr "fin de fichier pr�matur�e (dans le CRC)\n"
 
-#: g10/armor.c:865
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr "CRC d�form�\n"
 
-#: g10/armor.c:869 g10/armor.c:1427
+#: g10/armor.c:898 g10/armor.c:1456
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Erreur de CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:889
+#: g10/armor.c:918
 msgid "premature eof (in trailer)\n"
 msgstr "fin de fichier pr�matur�e (dans la remorque)\n"
 
-#: g10/armor.c:893
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr "erreur dans la ligne de remorque\n"
 
-#: g10/armor.c:1204
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr "aucune donn�e OpenPGP valide n'a �t� trouv�e.\n"
 
-#: g10/armor.c:1209
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armure invalide: ligne plus longue que %d caract�res\n"
 
-#: g10/armor.c:1213
+#: g10/armor.c:1242
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1236,11 +1274,11 @@ msgstr "Les commandes d'administration ne sont pas permises\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
-#: g10/decrypt.c:110 g10/encode.c:890
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
@@ -1251,7 +1289,7 @@ msgstr "impossible d'ouvrir `%s'\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "cl� � %s � introuvable: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1291,7 +1329,7 @@ msgstr "il y a une cl� secr�te pour la cl� publique \"%s\" !\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utiliser l'option �--delete-secret-keys� pour l'effacer d'abord.\n"
 
-#: g10/encode.c:226 g10/sign.c:1296
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
@@ -1311,7 +1349,7 @@ msgstr "utilisation de l'algorithme de chiffrement %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' d�j� compress�\n"
 
-#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISSEMENT: `%s' est un fichier vide\n"
@@ -1342,7 +1380,7 @@ msgstr ""
 "AVERTISSEMENT: forcer le chiffrement sym�trique %s (%d) entre\n"
 "en d�saccord avec les pr�f�rences du destinataire\n"
 
-#: g10/encode.c:669 g10/sign.c:966
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1351,19 +1389,19 @@ msgstr ""
 "AVERTISSEMENT: forcer l'algorithme de compression %s (%d) entre\n"
 "en d�saccord avec les pr�f�rences du destinataire\n"
 
-#: g10/encode.c:765
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forcer le chiffrement sym�trique %s (%d) entre en d�saccord\n"
 "avec les pr�ferences du destinataire\n"
 
-#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "vous ne pouvez pas utiliser %s en mode %s.\n"
 
-#: g10/encode.c:862
+#: g10/encode.c:848
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s chiffr� pour: \"%s\"\n"
@@ -1557,7 +1595,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:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1565,132 +1603,132 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/gpg.c:370
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/gpg.c:372 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/gpg.c:375 sm/gpgsm.c:248
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/gpg.c:377 sm/gpgsm.c:249
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/gpg.c:381 sm/gpgsm.c:252
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "lister les cl�s"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "list and check key signatures"
 msgstr "lister et v�rifier les signatures des cl�s"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/gpg.c:386 sm/gpgsm.c:254
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "remove keys from the public keyring"
 msgstr "enlever les cl�s du porte-cl�s public"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "remove keys from the secret keyring"
 msgstr "enlever les cl�s du porte-cl�s secret"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "signer une cl�"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "signer une cl� localement"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "signer ou �diter une cl�"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/gpg.c:397 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:402
 msgid "search for keys on a key server"
 msgstr "chercher les cl�s avec un serveur de cl�s"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "update all keys from a keyserver"
 msgstr "mettre � jour les cl�s depuis un serveur"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "importer/fusionner les cl�s"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr "afficher l'�tat de la carte"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr "changer les donn�es d'une carte"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr "changer le code PIN d'une carte"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr "mettre la base de confiance � jour"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/gpg.c:430 sm/gpgsm.c:264
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1700,47 +1738,48 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:281
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/gpg.c:436 sm/gpgsm.c:293
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/gpg.c:447 sm/gpgsm.c:331
+#: g10/gpg.c:449 sm/gpgsm.c:333
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/gpg.c:448 sm/gpgsm.c:334
+#: g10/gpg.c:450 sm/gpgsm.c:336
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:336
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
-msgid "use as output file"
-msgstr "utiliser comme fichier de sortie"
+#: g10/gpg.c:469 sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "lire les options de `%s'\n"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "demander avant d'�craser un fichier"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr "utiliser strictement le comportement OpenPGP"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr "g�n�rer des messages compatibles avec PGP 2.x"
 
-#: g10/gpg.c:553 sm/gpgsm.c:397
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1748,7 +1787,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:400
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1768,17 +1807,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/gpg.c:750 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Signaler toutes anomalies � <gnupg-bugs@gnu.org> (en anglais)\n"
 "et tout probl�me de traduction � <traduc@traduc.org>.\n"
 
-#: g10/gpg.c:767
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1788,7 +1827,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:781 sm/gpgsm.c:578
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1796,85 +1835,89 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/gpg.c:784
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr "Cl� publique: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Chiffrement: "
 
-#: g10/gpg.c:798
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr "Hachage: "
 
-#: g10/gpg.c:805 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:875
+#: g10/gpg.c:817 sm/gpgsm.c:603
+msgid "Used libraries:"
+msgstr ""
+
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:715
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/gpg.c:1063
+#: g10/gpg.c:1113
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "aucun signe = trouv� dans la d�finition du groupe `%s'\n"
 
-#: g10/gpg.c:1260
+#: g10/gpg.c:1310
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire personnel `%s' est\n"
 "peu s�r\n"
 
-#: g10/gpg.c:1263
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du fichier de configuration `%s'\n"
 "est peu s�r\n"
 
-#: g10/gpg.c:1266
+#: g10/gpg.c:1316
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire de l'extension `%s' est peu\n"
 "s�r\n"
 
-#: g10/gpg.c:1272
+#: g10/gpg.c:1322
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire personnel `%s'\n"
 "sont peu s�res\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1325
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du fichier de configuration\n"
 "`%s' sont peu s�res\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1328
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions de l'extension `%s' sont\n"
 "peu s�res\n"
 
-#: g10/gpg.c:1284
+#: g10/gpg.c:1334
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour le r�pertoire personnel `%s'\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1337
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1882,21 +1925,21 @@ msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour le fichier de configuration `%s'\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1340
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour l'extension `%s'\n"
 
-#: g10/gpg.c:1296
+#: g10/gpg.c:1346
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
 "r�pertoire personnel `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1349
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1904,482 +1947,482 @@ msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
 "fichier de configuration `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1352
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant\n"
 "l'extension `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1445
+#: g10/gpg.c:1495
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "�l�ment de configuration `%s' inconnu\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1594
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1602
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1610
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr ""
 "passer de la liste des cl�s secr�tes � celle des cl�s priv�es\n"
 "et inversement"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1612
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1825
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1981
+#: g10/gpg.c:2030
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTE: l'ancien fichier d'options par d�faut `%s' a �t� ignor�\n"
 
-#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
 
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2493
+#: g10/gpg.c:2565
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' n'est pas un jeu de caract�res valide\n"
 
-#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
 
-#: g10/gpg.c:2528
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2603
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2610
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: options d'import invalides\n"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2613
 msgid "invalid import options\n"
 msgstr "options d'import invalides\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2620
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/gpg.c:2551
+#: g10/gpg.c:2623
 msgid "invalid export options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2630
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: options de liste invalides\n"
 
-#: g10/gpg.c:2561
+#: g10/gpg.c:2633
 msgid "invalid list options\n"
 msgstr "options de liste invalides\n"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2645
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2653
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2655
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2659
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2670
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2673
 msgid "invalid verify options\n"
 msgstr "options de v�rification invalides\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossible de mettre le chemin d'ex�cution � %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2855
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1298
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2975
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "pas d'ex�cution ave une m�moire non s�curis�e � cause de %s\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de faire une signature d�tach�e ou en texte clair\n"
 "qu'en mode --pgp2\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "vous ne pouvez pas signer et chiffrer en m�me temps en mode --pgp2\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "vous devez utiliser des fichiers (et pas un tube) lorsque --pgp2\n"
 "est activ�.\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:3014
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1370
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1378
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3092
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression s�lectionn� est invalide\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3098
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3117
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth doit �tre compris entre 1 et 255\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3119
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3121
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: le mode S2K simple (0) est fortement d�conseill�\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide; ce doit �tre 0, 1 ou 3\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3135
 msgid "invalid default preferences\n"
 msgstr "pr�f�rences par d�faut invalides\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3144
 msgid "invalid personal cipher preferences\n"
 msgstr "pr�f�rences de chiffrement personnelles invalides\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3148
 msgid "invalid personal digest preferences\n"
 msgstr "pr�f�rences de hachage personnelles invalides\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3152
 msgid "invalid personal compress preferences\n"
 msgstr "pr�f�rences de compression personnelles invalides\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3185
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne marche pas encore avec %s\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3232
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de chiffrement `%s'\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3237
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de hachage `%s'\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3242
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de compression `%s'\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISSEMENT: des destinataires (-r) ont �t� donn�s alors que le\n"
 "chiffrement ne se fait pas par cl� publique\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3375
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "le chiffrement sym�trique de `%s' a �chou�: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3398
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "vous ne pouvez pas utiliser --symmetric --encrypt avec --s2k-mode 0\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "vous ne pouvez pas utiliser --symmetric --encrypt en mode %s.\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3449
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "Vous ne pouvez pas utiliser --symmetric --sign --encrypt avec\n"
 "--s2k-mode 0\n"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3454
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser --symmetric --sign --encrypt\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3474
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la r�ception depuis le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3630
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'export de la cl� a �chou�: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3641
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "la recherche au sein du serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3651
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "le rafra�chissement par le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4233
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donn�e est invalide\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4235
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donn�e est invalide\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4268
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
@@ -2393,7 +2436,7 @@ msgstr ""
 "faire en sorte que les conflits d'horodatage ne soient qu'un\n"
 "avertissement non fatal"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:372
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr "|FD|�crire l'�tat sur ce descripteur"
 
@@ -2936,13 +2979,13 @@ msgstr "cl� %s: nouvelle cl� - ignor�e\n"
 msgid "no writable keyring found: %s\n"
 msgstr "aucun porte-cl� n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2369 g10/import.c:2391
+#: g10/import.c:2381 g10/import.c:2403
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
@@ -3033,7 +3076,7 @@ msgstr ""
 msgid "importing secret keys not allowed\n"
 msgstr "il est interdit d'importer les cl� secr�tes\n"
 
-#: g10/import.c:1158 g10/import.c:2384
+#: g10/import.c:1158 g10/import.c:2396
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "pas de porte-cl�s par d�faut: %s\n"
@@ -3157,44 +3200,44 @@ msgstr "cl� %s: signature de sous-cl� au mauvais endroit - ignor�e\n"
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "cl� %s: classe de signature non attendue (0x%02X) - ignor�e\n"
 
-#: g10/import.c:1732
+#: g10/import.c:1744
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "cl� %s: nom d'utilisateur en double d�tect� - fusion accomplie\n"
 
-#: g10/import.c:1794
+#: g10/import.c:1806
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVERTISSEMENT: la cl� %s est peut-�tre r�voqu�e: recherche de\n"
 "la cl� de r�vocation %s\n"
 
-#: g10/import.c:1808
+#: g10/import.c:1820
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVERTISSEMENT: la cl� %s est peut-�tre r�voqu�e: la cl� de\n"
 "r�vocation %s est absente.\n"
 
-#: g10/import.c:1867
+#: g10/import.c:1879
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "cl� %s: certificat de r�vocation � %s � ajout�\n"
 
-#: g10/import.c:1901
+#: g10/import.c:1913
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "cl� %s: ajout de la signature de cl� directe\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2302
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "NOTE: le num�ro de s�rie d'une cl� n'est pas celui de la carte\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2310
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "NOTE: la cl� primaire est en ligne et stock�e sur la carte\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2312
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "NOTE: la cl� secondaire est en ligne et stock�e sur la carte\n"
 
@@ -3503,7 +3546,7 @@ msgid "Really sign? (y/N) "
 msgstr "Signer r�ellement ? (o/N) "
 
 #: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:348
+#: g10/keyedit.c:5019 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
@@ -3852,8 +3895,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer cette sous-cl� ? (o/N) "
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "La confiance du propri�taire peut ne pas �tre positionn�e en utilisant\n"
 "la base de confiance d'un tiers\n"
@@ -4743,7 +4785,7 @@ msgid "Key generation failed: %s\n"
 msgstr "La g�n�ration de cl� a �chou�: %s\n"
 
 # on s'amuse comme on peut...
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:273
+#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4751,7 +4793,7 @@ msgstr ""
 "la cl� a �t� cr��e %lu seconde dans le futur (rupture spatio-temporelle ou\n"
 "probl�me d'horloge)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:275
+#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5369,17 +5411,17 @@ msgstr "Non-compress�"
 msgid "uncompressed|none"
 msgstr "noncompress�|non"
 
-#: g10/misc.c:874
+#: g10/misc.c:891
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "ce message ne sera pas utilisable par %s\n"
 
-#: g10/misc.c:1049
+#: g10/misc.c:1066
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "option ambigu� `%s'\n"
 
-#: g10/misc.c:1074
+#: g10/misc.c:1091
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "option `%s' inconnue\n"
@@ -5438,12 +5480,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un sous-paquet de type %d poss�de un bit critique\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:603
+#: g10/passphrase.c:295 g10/passphrase.c:581
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cl� principale %s)"
 
-#: g10/passphrase.c:327
+#: g10/passphrase.c:309
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5455,24 +5497,24 @@ msgstr ""
 "\"%.*s\"\n"
 "cl� %u bits %s, ID %s, cr��e %s%s\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:334
 msgid "Repeat passphrase\n"
 msgstr "R�p�tez la phrase de passe\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:336
 msgid "Enter passphrase\n"
 msgstr "Entrez la phrase de passe\n"
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:363
 msgid "cancelled by user\n"
 msgstr "annul� par l'utilisateur\n"
 
-#: g10/passphrase.c:384 g10/passphrase.c:450
+#: g10/passphrase.c:369 g10/passphrase.c:428
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "probl�me avec l'agent - arr�t d'utilisation de l'agent\n"
 
-#: g10/passphrase.c:582
+#: g10/passphrase.c:560
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5481,12 +5523,12 @@ msgstr ""
 "Vous avez besoin d'une phrase de passe pour d�verrouiller la\n"
 "cl� secr�te pour l'utilisateur: � %s �\n"
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:568
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "cl� de %u bits %s, ID %s, cr��e le %s"
 
-#: g10/passphrase.c:599
+#: g10/passphrase.c:577
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "        (sous-cl� de la cl� principale ID %s)"
@@ -6132,38 +6174,14 @@ msgstr ""
 "cl� %s: pas de sous-cl� pour la signature de liaison � la\n"
 "sous-cl�\n"
 
-#: g10/sign.c:82
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"impossible de mettre des donn�es de notation dans des signatures v3\n"
-"(de style PGP 2.x)\n"
-
-#: g10/sign.c:90
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-"impossible de mettres des donn�es de notation dans des signatures de\n"
-"cl�s v3 (de style PGP 2.x)\n"
-
-#: g10/sign.c:104
+#: g10/sign.c:89
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVERTISSEMENT: impossible de faire une expansion � base de %%\n"
 "(cha�ne trop grande). Utilisation de la version non expans�e.\n"
 
-#: g10/sign.c:121
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"impossible de mettre une URL de politique dans des signatures v3\n"
-"(de style PGP 2.x)\n"
-
-#: g10/sign.c:129
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-"impossible de mettre une URL de politique dans des signatures de cl� v3\n"
-"(de style PGP 2.x)\n"
-
-#: g10/sign.c:142
+#: g10/sign.c:115
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6171,7 +6189,7 @@ msgstr ""
 "AVERTISSEMENT: impossible de faire une expansion � base de %% de l'URL\n"
 "de politique (trop grande). Utilisation de la version non expans�e.\n"
 
-#: g10/sign.c:170
+#: g10/sign.c:138
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6180,23 +6198,23 @@ msgstr ""
 "AVERTISSEMENT: impossible de faire une expansion � base de %% de l'URL\n"
 "de politique (trop grande). Utilisation de la version non expans�e.\n"
 
-#: g10/sign.c:343
+#: g10/sign.c:311
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 
-#: g10/sign.c:352
+#: g10/sign.c:320
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signature de: � %s �\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible g�n�rer une signature d�tach�e avec des cl�s de\n"
 "style PGP 2.x qu'en mode --pgp2\n"
 
-#: g10/sign.c:864
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6204,17 +6222,17 @@ msgstr ""
 "AVERTISSEMENT: forcer l'algorithme de hachage %s (%d) entre en\n"
 "d�saccord avec les pr�f�rences du destinataire\n"
 
-#: g10/sign.c:991
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "signature:"
 
-#: g10/sign.c:1106
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de faire une signature en texte clair avec des cl�s\n"
 "de style PGP 2.x qu'en mode --pgp2\n"
 
-#: g10/sign.c:1290
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "le chiffrement %s sera utilis�\n"
@@ -6944,61 +6962,61 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "impossible d'acc�der � %s - carte OpenPGP invalide ?\n"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:114 sm/gpgsm.c:361
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 #, fuzzy
 msgid "read options from file"
 msgstr "lire les options de `%s'\n"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:122
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:123
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:126
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:135
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "indiquer les commandes d'administration"
 
-#: scd/scdaemon.c:209
+#: scd/scdaemon.c:210
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: scd/scdaemon.c:211
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:658
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1006
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1011
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7032,11 +7050,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1631
+#: sm/certchain.c:195 sm/certchain.c:1646
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1631
+#: sm/certchain.c:196 sm/certchain.c:1646
 msgid "shell"
 msgstr ""
 
@@ -7076,8 +7094,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "le stockage de la cl� a �chou�: %s\n"
@@ -7246,7 +7264,7 @@ msgstr ""
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1730
+#: sm/certchain.c:1462 sm/certchain.c:1745
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "pr�f�rence `%s' dupliqu�e\n"
@@ -7261,11 +7279,11 @@ msgstr "Certificat de r�vocation cr��.\n"
 msgid "root certificate is good\n"
 msgstr "mauvais certificat"
 
-#: sm/certchain.c:1620
+#: sm/certchain.c:1635
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1629
+#: sm/certchain.c:1644
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7280,7 +7298,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7294,25 +7312,25 @@ msgstr "non"
 msgid "[none]"
 msgstr "[non positionn�]"
 
-#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
+#: sm/certdump.c:583 sm/certdump.c:628 sm/certdump.c:693 sm/certdump.c:746
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "Erreur: r�ponse invalide.\n"
 
-#: sm/certdump.c:558 sm/certdump.c:603
+#: sm/certdump.c:591 sm/certdump.c:636
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:640 sm/certdump.c:696
+#: sm/certdump.c:673 sm/certdump.c:729
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:665 sm/certdump.c:719
+#: sm/certdump.c:698 sm/certdump.c:752
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "Erreur: r�ponse invalide.\n"
 
-#: sm/certdump.c:936
+#: sm/certdump.c:946
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7442,190 +7460,199 @@ msgstr "la suppression du bloc de cl�s a �chou� : %s\n"
 msgid "no valid recipients given\n"
 msgstr "(Aucune description donn�e)\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list external keys"
 msgstr "lister les cl�s secr�tes"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
 #, fuzzy
 msgid "list certificate chain"
 msgstr "mauvais certificat"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:260
 #, 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:263
 #, fuzzy
 msgid "import certificates"
 msgstr "mauvais certificat"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "export certificates"
 msgstr "mauvais certificat"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "register a smartcard"
 msgstr "ajouter une cl� � une carte � puce"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:270
 #, fuzzy
 msgid "change a passphrase"
 msgstr "changer la phrase de passe"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 #, 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:342
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:345
+msgid "|FILE|write a server mode log to FILE"
+msgstr ""
+
+#: sm/gpgsm.c:347
+#, fuzzy
+msgid "|FILE|write an audit log to FILE"
+msgstr "lire les options de `%s'\n"
+
+#: sm/gpgsm.c:349
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "v�rifier les signatures"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:359
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "enlever les cl�s de ce porte-cl�s"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:360
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "Il faut la cl� secr�te pour faire cela.\n"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:363
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:379
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:388
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "algorithme de chiffrement inconnu"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:390
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:392
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "algorithme de compression inconnu"
 
-#: sm/gpgsm.c:568
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: sm/gpgsm.c:571
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7636,36 +7663,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:650
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "utilisation: gpg [options] "
 
-#: sm/gpgsm.c:748
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "impossible de se connecter � `%s': %s\n"
 
-#: sm/gpgsm.c:759
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "option `%s' inconnue\n"
 
-#: sm/gpgsm.c:1315
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1411
+#: sm/gpgsm.c:1468
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1429
+#: sm/gpgsm.c:1486
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "impossible d'acc�der � `%s': %s\n"
 
-#: sm/gpgsm.c:1612
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7688,7 +7715,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:1274
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
@@ -7755,17 +7782,17 @@ msgstr "erreur pendant la lecture de `%s': %s\n"
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:111
+#: sm/qualified.c:105
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "Erreur: empreinte mal format�e.\n"
 
-#: sm/qualified.c:129
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:225
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7776,13 +7803,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234 sm/verify.c:536
+#: sm/qualified.c:209 sm/verify.c:580
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:327
+#: sm/qualified.c:277
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7795,294 +7822,312 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:424
 #, fuzzy
 msgid "Signature made "
 msgstr "Signature faite le %s\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:428
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:429
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr ""
 "erreur durant la lecture des informations contenues actuellement\n"
 "dans la cl�: %s\n"
 
-#: sm/verify.c:514
+#: sm/verify.c:558
 #, fuzzy
 msgid "Good signature from"
 msgstr "Bonne signature de � %s �"
 
-#: sm/verify.c:515
+#: sm/verify.c:559
 #, fuzzy
 msgid "                aka"
 msgstr "                alias � %s �"
 
-#: sm/verify.c:533
+#: sm/verify.c:577
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "Ceci sera une auto-signature.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "quitter"
 
-#: tools/gpg-connect-agent.c:60
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:127
+#: tools/gpg-connect-agent.c:74
+#, fuzzy
+msgid "|FILE|run commands from FILE on startup"
+msgstr "lire les options de `%s'\n"
+
+#: tools/gpg-connect-agent.c:75
+msgid "run /subst on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:174
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: tools/gpg-connect-agent.c:130
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:314
+#: tools/gpg-connect-agent.c:1155
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:323
+#: tools/gpg-connect-agent.c:1164
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:381
+#: tools/gpg-connect-agent.c:1219 tools/gpg-connect-agent.c:1645
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "la lecture de la cl� publique a �chou�: %s\n"
+
+#: tools/gpg-connect-agent.c:1299
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "ligne trop longue"
 
-#: tools/gpg-connect-agent.c:385
+#: tools/gpg-connect-agent.c:1303
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:1619
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "option `%s' inconnue\n"
 
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:1637
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
 
-#: tools/gpg-connect-agent.c:473
-#, fuzzy, c-format
-msgid "receiving line failed: %s\n"
-msgstr "la lecture de la cl� publique a �chou�: %s\n"
-
-#: tools/gpg-connect-agent.c:789
+#: tools/gpg-connect-agent.c:1986
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:798
+#: tools/gpg-connect-agent.c:1995
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr ""
 "erreur pendant la recherche de l'enregistrement de confiance\n"
 "dans `%s': %s\n"
 
-#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
-#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
+#: tools/gpgconf-comp.c:459 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:773
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:796
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
-#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
+#: tools/gpgconf-comp.c:482 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:803
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
-#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:487 tools/gpgconf-comp.c:606 tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:729 tools/gpgconf-comp.c:811
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:737
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:504
+#: tools/gpgconf-comp.c:502
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:506
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:512
+#: tools/gpgconf-comp.c:510
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:526
+#: tools/gpgconf-comp.c:524
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:527
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:531
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:535
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:539
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:543
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "r�voquer la cl� ou les sous-cl�s s�lectionn�es"
 
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:547
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:710
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:669
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
 
-#: tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:674
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:719
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:744
+#: tools/gpgconf-comp.c:742
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:786
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:824
+#: tools/gpgconf-comp.c:822
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:834
+#: tools/gpgconf-comp.c:832
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:845
+#: tools/gpgconf-comp.c:843
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:850
+#: tools/gpgconf-comp.c:848
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:887
+#: tools/gpgconf-comp.c:885
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2982
+#: tools/gpgconf-comp.c:3006
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:59
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
+#, fuzzy
+msgid "list global configuration file"
+msgstr "�l�ment de configuration `%s' inconnu\n"
+
+#: tools/gpgconf.c:67
 #, fuzzy
 msgid "check global configuration file"
 msgstr "�l�ment de configuration `%s' inconnu\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:71
+msgid "use as output file"
+msgstr "utiliser comme fichier de sortie"
+
+#: tools/gpgconf.c:75
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:100
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:176 tools/gpgconf.c:209
+#: tools/gpgconf.c:202 tools/gpgconf.c:240
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "utilisation: gpg [options] "
 
-#: tools/gpgconf.c:178
+#: tools/gpgconf.c:204
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:187
+#: tools/gpgconf.c:213
 #, fuzzy
 msgid "Component not found"
 msgstr "cl� publique non trouv�e"
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:242
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Les commandes d'administration ne sont pas permises\n"
@@ -8176,92 +8221,112 @@ msgstr "erreur pendant la lecture de `%s': %s\n"
 msgid "error closing %s: %s\n"
 msgstr "erreur dans `%s': %s\n"
 
-#: tools/symcryptrun.c:515
+#: tools/symcryptrun.c:486
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "aucun programme d'ex�cution distante n'est support�\n"
 
-#: tools/symcryptrun.c:521
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:556
+#: tools/symcryptrun.c:527
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: tools/symcryptrun.c:563
+#: tools/symcryptrun.c:534
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: tools/symcryptrun.c:579
+#: tools/symcryptrun.c:550
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:578
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: tools/symcryptrun.c:636
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "la suppression du bloc de cl�s a �chou� : %s\n"
 
-#: tools/symcryptrun.c:653
+#: tools/symcryptrun.c:624
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: tools/symcryptrun.c:705
+#: tools/symcryptrun.c:676
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: tools/symcryptrun.c:757
+#: tools/symcryptrun.c:728
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: tools/symcryptrun.c:771
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:826
+#: tools/symcryptrun.c:797
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "impossible de cr�er le fichier de sauvegarde `%s': %s\n"
 
-#: tools/symcryptrun.c:839
+#: tools/symcryptrun.c:810
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "impossible de cr�er le fichier de sauvegarde `%s': %s\n"
 
-#: tools/symcryptrun.c:1014
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1041
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1050
+#: tools/symcryptrun.c:1021
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "le hachage de protection %d n'est pas support�\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "impossible de mettre des donn�es de notation dans des signatures v3\n"
+#~ "(de style PGP 2.x)\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "impossible de mettres des donn�es de notation dans des signatures de\n"
+#~ "cl�s v3 (de style PGP 2.x)\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "impossible de mettre une URL de politique dans des signatures v3\n"
+#~ "(de style PGP 2.x)\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "impossible de mettre une URL de politique dans des signatures de cl� v3\n"
+#~ "(de style PGP 2.x)\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
diff --git a/po/gl.po b/po/gl.po
index 0230d4252..77c23bbfc 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-09-14 13:27+0200\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -14,59 +14,75 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: agent/call-pinentry.c:438
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:441
+#: agent/call-pinentry.c:551
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: agent/call-pinentry.c:489
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+msgid "Quality:"
+msgstr ""
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 #, fuzzy
 msgid "PIN too long"
 msgstr "li�a longa de m�is\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:668
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "contrasinal demasiado longo\n"
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:676
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter non v�lido no nome\n"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:535
+#: agent/call-pinentry.c:693
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI err�neo"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:694
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "contrasinal err�neo"
 
-#: agent/call-pinentry.c:572
+#: agent/call-pinentry.c:730
 #, fuzzy
 msgid "Passphrase"
 msgstr "contrasinal err�neo"
@@ -76,21 +92,21 @@ msgstr "contrasinal err�neo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
-#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1865
-#: sm/gpgsm.c:1902 sm/gpgsm.c:1940 sm/qualified.c:72
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
@@ -130,14 +146,25 @@ msgstr "erro escribindo no chaveiro `%s': %s\n"
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: agent/command-ssh.c:2349
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "cambia-lo contrasinal"
+
+#: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2850
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/command-ssh.c:2885
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: fallo ao crear unha t�boa hash: %s\n"
@@ -183,76 +210,66 @@ msgstr "Introduza o contrasinal\n"
 msgid "Take this one anyway"
 msgstr "�Empregar esta chave de t�dolos xeitos?"
 
-#: agent/genkey.c:185
+#: agent/genkey.c:191
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u character long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u characters long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:202
+#: agent/genkey.c:212
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digit or special character."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digits or special characters."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:225
+#: agent/genkey.c:235
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
-"passphrase may not%0Abe a known term or match certain pattern."
+"Warning: You have entered an insecure passphrase.%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:238
+#: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:240
+#: agent/genkey.c:253
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:246
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:290
+#: agent/genkey.c:306
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Necesita un contrasinal para protexe-la s�a chave secreta.\n"
 "\n"
 
-#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "cambia-lo contrasinal"
-
-#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
-#: tools/symcryptrun.c:456
-msgid "does not match - try again"
-msgstr ""
-
-#: agent/genkey.c:412
+#: agent/genkey.c:429
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:104
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -262,68 +279,67 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:109
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:69 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "lareto"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:341
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "ser un pouqui�o m�is calado"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:112
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:113
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
-#: tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:134
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualiza-la base de datos de confianza"
@@ -361,152 +377,167 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:91 tools/symcryptrun.c:204
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
 "Por favor, informe dos erros no programa a <gnupg-bugs@gnu.org>,\n"
 "e dos erros na traducci�n a <proxecto@trasno.net>.\n"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:512 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:340 sm/gpgsm.c:819 sm/gpgsm.c:822 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, 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:610 agent/gpg-agent.c:1177 g10/gpg.c:2027
-#: scd/scdaemon.c:421 sm/gpgsm.c:914 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: agent/gpg-agent.c:947 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: agent/gpg-agent.c:1247 agent/gpg-agent.c:1373 agent/gpg-agent.c:1377
-#: agent/gpg-agent.c:1418 agent/gpg-agent.c:1422 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:908
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
+#: agent/gpg-agent.c:1321
+#, fuzzy, c-format
+msgid "socket name `%s' is too long\n"
+msgstr "Revocaci�n de certificado v�lida"
+
+#: agent/gpg-agent.c:1333
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
+#, fuzzy
+msgid "error getting nonce for the socket\n"
+msgstr "erro ao crea-lo contrasinal: %s\n"
+
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directorio creado\n"
 
-#: agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1448
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1438
+#: agent/gpg-agent.c:1452
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: non foi posible crear un directorio: %s\n"
 
-#: agent/gpg-agent.c:1549
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
+#, fuzzy, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "erro lendo `%s': %s\n"
+
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1554
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1571
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1576
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves omitidas\n"
 
-#: agent/gpg-agent.c:1809
+#: agent/gpg-agent.c:1850
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:756
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
 
-#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
-#: tools/gpg-connect-agent.c:767
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "a versi�n %d do protocolo de gpg-agent non est� soportada\n"
@@ -533,40 +564,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1188
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1191
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: agent/protect-tool.c:1216
+#: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1221
+#: agent/protect-tool.c:1199
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "contrasinal err�neo"
 
-#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancelar"
@@ -678,7 +709,8 @@ msgstr "cambia-lo contrasinal"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1338
+#: tools/gpgconf-comp.c:1641
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
@@ -827,77 +859,82 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:366
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr "cabeceira de armadura non v�lida: "
 
-#: g10/armor.c:416
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr "cabeceira de armadura: "
 
-#: g10/armor.c:427
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr "cabeceira de sinatura en claro non v�lida\n"
 
-#: g10/armor.c:479
+#: g10/armor.c:455
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "cabeceira de armadura: "
+
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr "sinaturas en texto claro ani�adas\n"
 
-#: g10/armor.c:614
+#: g10/armor.c:643
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:626
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr "li�a escapada cunha barra non v�lida: "
 
-#: g10/armor.c:780 g10/armor.c:1390
+#: g10/armor.c:809 g10/armor.c:1419
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "car�cter radix64 non v�lido %02x omitido\n"
 
-#: g10/armor.c:823
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr "fin de ficheiro prematura (non hai CRC)\n"
 
-#: g10/armor.c:857
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr "fin de ficheiro prematura (no CRC)\n"
 
-#: g10/armor.c:865
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr "CRC mal formado\n"
 
-#: g10/armor.c:869 g10/armor.c:1427
+#: g10/armor.c:898 g10/armor.c:1456
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:889
+#: g10/armor.c:918
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fin de ficheiro prematura (nas li�as adicionais)\n"
 
-#: g10/armor.c:893
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr "error nunha li�a adicional\n"
 
-#: g10/armor.c:1204
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: g10/armor.c:1209
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura incorrecta: li�a m�is longa ca %d caracteres\n"
 
-#: g10/armor.c:1213
+#: g10/armor.c:1242
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1243,11 +1280,11 @@ msgstr "gravando a chave secreta en `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
-#: g10/decrypt.c:110 g10/encode.c:890
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "non se puido abrir `%s'\n"
@@ -1258,7 +1295,7 @@ msgstr "non se puido abrir `%s'\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1302,7 +1339,7 @@ msgstr "�hai unha chave secreta para a chave p�blica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "empregue a opci�n \"--delete-secret-keys\" para borrala primeiro.\n"
 
-#: g10/encode.c:226 g10/sign.c:1296
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
@@ -1321,7 +1358,7 @@ msgstr "fallou a sinatura: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' xa est� comprimido\n"
 
-#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � un ficheiro baleiro\n"
@@ -1349,7 +1386,7 @@ msgid ""
 msgstr ""
 "forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/encode.c:669 g10/sign.c:966
+#: g10/encode.c:655 g10/sign.c:936
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1358,18 +1395,18 @@ msgstr ""
 "forza-lo algoritmo de compresi�n %s (%d) viola as preferencias do "
 "destinatario\n"
 
-#: g10/encode.c:765
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/encode.c:862
+#: g10/encode.c:848
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
@@ -1559,7 +1596,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:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1567,133 +1604,133 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:370
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|facer unha sinatura"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/gpg.c:372 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/gpg.c:375 sm/gpgsm.c:248
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar s� con cifrado sim�trico"
 
-#: g10/gpg.c:377 sm/gpgsm.c:249
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/gpg.c:381 sm/gpgsm.c:252
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "ve-la lista de chaves e sinaturas"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/gpg.c:386 sm/gpgsm.c:254
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "remove keys from the public keyring"
 msgstr "borrar chaves do chaveiro p�blico"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "remove keys from the secret keyring"
 msgstr "borrar chaves do chaveiro secreto"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "asinar unha chave"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "asinar ou editar unha chave"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "xerar un certificado de revocaci�n"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:397 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:402
 msgid "search for keys on a key server"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "update all keys from a keyserver"
 msgstr "actualizar t�dalas chaves dun servidor de chaves"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "importar/mesturar chaves"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:410
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/gpg.c:430 sm/gpgsm.c:264
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1703,47 +1740,48 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:281
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: g10/gpg.c:436 sm/gpgsm.c:293
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:447 sm/gpgsm.c:331
+#: g10/gpg.c:449 sm/gpgsm.c:333
 msgid "use this user-id to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/gpg.c:448 sm/gpgsm.c:334
+#: g10/gpg.c:450 sm/gpgsm.c:336
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresi�n a N (0 desactiva)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:336
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
-msgid "use as output file"
-msgstr "usar coma ficheiro de sa�da"
+#: g10/gpg.c:469 sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "non facer ning�n cambio"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "avisar antes de sobrescribir"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:524
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:397
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1751,7 +1789,7 @@ msgstr ""
 "@\n"
 "(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:400
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1771,17 +1809,17 @@ msgstr ""
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/gpg.c:750 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Por favor, informe dos erros no programa a <gnupg-bugs@gnu.org>,\n"
 "e dos erros na traducci�n a <proxecto@trasno.net>.\n"
 
-#: g10/gpg.c:767
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1791,7 +1829,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:578
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1799,560 +1837,564 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/gpg.c:784
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr "P�blica: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:798
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:805 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:875
+#: g10/gpg.c:817 sm/gpgsm.c:603
+msgid "Used libraries:"
+msgstr ""
+
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:715
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/gpg.c:1063
+#: g10/gpg.c:1113
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "non se atopou un signo = na definici�n do grupo \"%s\"\n"
 
-#: g10/gpg.c:1260
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1263
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1266
+#: g10/gpg.c:1316
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1272
+#: g10/gpg.c:1322
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1325
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1328
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1284
+#: g10/gpg.c:1334
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1337
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1340
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1296
+#: g10/gpg.c:1346
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1349
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1352
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1445
+#: g10/gpg.c:1495
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1594
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1602
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1610
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "amosar en que chaveiro est� unha chave listada"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1612
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1825
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1981
+#: g10/gpg.c:2030
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: ign�rase o antigo ficheiro de opci�ns por defecto `%s'\n"
 
-#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s non � para uso normal!\n"
 
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2493
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/gpg.c:2528
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2610
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2613
 msgid "invalid import options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2620
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2551
+#: g10/gpg.c:2623
 msgid "invalid export options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2630
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2561
+#: g10/gpg.c:2633
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2645
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2653
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2655
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2659
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2670
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2673
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2855
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1298
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2975
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode crear sinaturas separadas ou en claro no modo --pgp2\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "non pode asinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "debe empregar ficheiros (e non canalizaci�ns) ao traballar con --pgp2 "
 "activado.\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:3014
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1370
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1378
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3092
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3098
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3117
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe valer entre 1 e 255\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3119
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3121
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non v�lido; debe ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3135
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non v�lidas\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3144
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non v�lidas\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3148
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non v�lidas\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3152
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresi�n personais non v�lidas\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3185
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�%s a�nda non traballa con %s!\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3232
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3237
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3242
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de compresi�n \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: deronse destinatarios (-r) sen empregar cifrado de chave p�blica\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3375
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3403
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3449
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3454
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3474
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3630
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportaci�n da chave fallou: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3641
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3651
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4233
 msgid "the given certification policy URL is invalid\n"
 msgstr "o URL de normativa de certificaci�n dado non � v�lido\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4235
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4268
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
@@ -2365,7 +2407,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:75 sm/gpgsm.c:372
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribi-la informaci�n de estado a este DF"
 
@@ -2890,13 +2932,13 @@ msgstr "chave %08lX: nova chave - omitida\n"
 msgid "no writable keyring found: %s\n"
 msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribindo a `%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2369 g10/import.c:2391
+#: g10/import.c:2381 g10/import.c:2403
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
@@ -2990,7 +3032,7 @@ msgstr "chave %08lX: chave secreta cunha cifra %d non v�lida - omitida\n"
 msgid "importing secret keys not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/import.c:1158 g10/import.c:2384
+#: g10/import.c:1158 g10/import.c:2396
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "non hai un chaveiro privado por defecto: %s\n"
@@ -3117,46 +3159,46 @@ msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: clase de sinatura non esperada (0x%02X) - omitida\n"
 
-#: g10/import.c:1732
+#: g10/import.c:1744
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: ID de usuario duplicado detectado - mesturado\n"
 
-#: g10/import.c:1794
+#: g10/import.c:1806
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: obtendo a chave de revocaci�n %"
 "08lX\n"
 
-#: g10/import.c:1808
+#: g10/import.c:1820
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revocaci�n %08lX "
 "ausente.\n"
 
-#: g10/import.c:1867
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: \"%s\" certificado de revocaci�n engadido\n"
 
-#: g10/import.c:1901
+#: g10/import.c:1913
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2302
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "�a chave p�blica con coincide coa chave secreta!\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2310
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2312
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
@@ -3480,7 +3522,7 @@ msgid "Really sign? (y/N) "
 msgstr "�Asinar de verdade? "
 
 #: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:348
+#: g10/keyedit.c:5019 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
@@ -3849,8 +3891,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�Realmente quere revocar esta chave? "
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
 #: g10/keyedit.c:2140
@@ -4743,7 +4784,7 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:273
+#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4751,7 +4792,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:275
+#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5355,17 +5396,17 @@ msgstr "Sen comprimir"
 msgid "uncompressed|none"
 msgstr "Sen comprimir"
 
-#: g10/misc.c:874
+#: g10/misc.c:891
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "esta mensaxe pode non ser utilizable por %s\n"
 
-#: g10/misc.c:1049
+#: g10/misc.c:1066
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/misc.c:1074
+#: g10/misc.c:1091
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
@@ -5423,12 +5464,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un subpaquete de tipo %d ten o bit cr�tico posto\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:603
+#: g10/passphrase.c:295 g10/passphrase.c:581
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:327
+#: g10/passphrase.c:309
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5439,24 +5480,24 @@ msgstr ""
 "\"%.*s\"\n"
 "Chave de %u bits, %s, ID %08lX, creada o %s%s\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:334
 msgid "Repeat passphrase\n"
 msgstr "Repita o contrasinal\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:336
 msgid "Enter passphrase\n"
 msgstr "Introduza o contrasinal\n"
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:363
 msgid "cancelled by user\n"
 msgstr "cancelado polo usuario\n"
 
-#: g10/passphrase.c:384 g10/passphrase.c:450
+#: g10/passphrase.c:369 g10/passphrase.c:428
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
 
-#: g10/passphrase.c:582
+#: g10/passphrase.c:560
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5466,12 +5507,12 @@ msgstr ""
 "Necesita un contrasinal para desbloquea-la chave secreta para\n"
 "o usuario \""
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:568
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bits, chave %s, ID %08lX, creada %s"
 
-#: g10/passphrase.c:599
+#: g10/passphrase.c:577
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6117,80 +6158,58 @@ msgstr ""
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "chave %08lX: non hai sub-chave para a sinatura da ligaz�n da chave\n"
 
-#: g10/sign.c:82
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"non se pode po�er datos de notaci�n nas sinaturas v3 (estilo PGP 2.x)\n"
-
-#: g10/sign.c:90
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-"non se pode po�er datos de notaci�n nas sinaturas de chave v3 (estilo PGP 2."
-"x)\n"
-
-#: g10/sign.c:104
+#: g10/sign.c:89
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVISO: non se pode expandir-%% a notaci�n (grande de m�is). �sase sen "
 "expandir.\n"
 
-#: g10/sign.c:121
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"non se pode po�er un URL de pol�tica nas sinaturas v3 (estilo PGP 2.x)\n"
-
-#: g10/sign.c:129
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-"non se pode po�er un URL de pol�tica nas sinaturas de chave v3 (estilo PGP 2."
-"x)\n"
-
-#: g10/sign.c:142
+#: g10/sign.c:115
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de m�is).\n"
 
-#: g10/sign.c:170
+#: g10/sign.c:138
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de m�is).\n"
 
-#: g10/sign.c:343
+#: g10/sign.c:311
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 
-#: g10/sign.c:352
+#: g10/sign.c:320
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "Sinatura %s de: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "s� pode asinar nun ficheiro separado con chaves estilo PGP 2.x no modo --"
 "pgp2\n"
 
-#: g10/sign.c:864
+#: g10/sign.c:834
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/sign.c:991
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "asinando:"
 
-#: g10/sign.c:1106
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode asinar en claro con chaves estilo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:1290
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "hase empregar cifrado %s\n"
@@ -6909,64 +6928,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:114 sm/gpgsm.c:361
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 #, fuzzy
 msgid "read options from file"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "non usa-la terminal en absoluto"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:135
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "comandos conflictivos\n"
 
-#: scd/scdaemon.c:209
+#: scd/scdaemon.c:210
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: scd/scdaemon.c:211
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:658
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1006
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1011
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7000,11 +7019,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1631
+#: sm/certchain.c:195 sm/certchain.c:1646
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1631
+#: sm/certchain.c:196 sm/certchain.c:1646
 #, fuzzy
 msgid "shell"
 msgstr "axuda"
@@ -7045,8 +7064,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
@@ -7224,7 +7243,7 @@ msgstr ""
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1730
+#: sm/certchain.c:1462 sm/certchain.c:1745
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "Revocaci�n de certificado v�lida"
@@ -7241,11 +7260,11 @@ msgstr ""
 "Non se atoparon certificados con confianza non definida.\n"
 "\n"
 
-#: sm/certchain.c:1620
+#: sm/certchain.c:1635
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1629
+#: sm/certchain.c:1644
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7260,7 +7279,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7274,25 +7293,25 @@ msgstr "non|nom"
 msgid "[none]"
 msgstr "desco�ecido"
 
-#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
+#: sm/certdump.c:583 sm/certdump.c:628 sm/certdump.c:693 sm/certdump.c:746
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: sm/certdump.c:558 sm/certdump.c:603
+#: sm/certdump.c:591 sm/certdump.c:636
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:640 sm/certdump.c:696
+#: sm/certdump.c:673 sm/certdump.c:729
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:665 sm/certdump.c:719
+#: sm/certdump.c:698 sm/certdump.c:752
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: sm/certdump.c:936
+#: sm/certdump.c:946
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7419,181 +7438,190 @@ msgstr "fallou o borrado do bloque de chaves: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(Non se deu unha descrici�n)\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[ficheiro]|facer unha sinatura"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list external keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "borrar chaves do chaveiro p�blico"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:270
 #, fuzzy
 msgid "change a passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "use the default key as default recipient"
 msgstr "usa-la chave por defecto coma o destinatario por defecto"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr "non usa-la terminal en absoluto"
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:345
+msgid "|FILE|write a server mode log to FILE"
+msgstr ""
+
+#: sm/gpgsm.c:347
+#, fuzzy
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
+
+#: sm/gpgsm.c:349
 msgid "force v3 signatures"
 msgstr "forzar sinaturas v3"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr "sempre usar un MDC para cifrar"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr "modo por lotes: non preguntar nunca"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr "asumir `si' na maior�a das preguntas"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr "asumir `non' na maior�a das preguntas"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:359
 msgid "add this keyring to the list of keyrings"
 msgstr "engadir este chaveiro � lista de chaveiros"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:360
 msgid "add this secret keyring to the list"
 msgstr "engadir este chaveiro secreto � lista"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:363
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|axusta-lo xogo de caracteres do terminal a NOME"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:379
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:388
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:390
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:392
 msgid "|N|use compress algorithm N"
 msgstr "|N|emprega-lo algoritmo de compresi�n N"
 
-#: sm/gpgsm.c:568
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: sm/gpgsm.c:571
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7604,36 +7632,36 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: sm/gpgsm.c:650
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: sm/gpgsm.c:748
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "non se puido conectar a `%s': %s\n"
 
-#: sm/gpgsm.c:759
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
 
-#: sm/gpgsm.c:1315
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1411
+#: sm/gpgsm.c:1468
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: sm/gpgsm.c:1429
+#: sm/gpgsm.c:1486
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: sm/gpgsm.c:1612
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7656,7 +7684,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:1274
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro lendo `%s': %s\n"
@@ -7719,17 +7747,17 @@ msgstr "erro lendo `%s': %s\n"
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:111
+#: sm/qualified.c:105
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: sm/qualified.c:129
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:225
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7740,13 +7768,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234 sm/verify.c:536
+#: sm/qualified.c:209 sm/verify.c:580
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:327
+#: sm/qualified.c:277
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7759,294 +7787,312 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:424
 #, fuzzy
 msgid "Signature made "
 msgstr "A sinatura caducou o %s\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:428
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:429
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/verify.c:514
+#: sm/verify.c:558
 #, fuzzy
 msgid "Good signature from"
 msgstr "Sinatura correcta de \""
 
-#: sm/verify.c:515
+#: sm/verify.c:559
 #, fuzzy
 msgid "                aka"
 msgstr "               alias \""
 
-#: sm/verify.c:533
+#: sm/verify.c:577
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr ""
 "\n"
 "Esta ha ser unha auto-sinatura.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "abandonar"
 
-#: tools/gpg-connect-agent.c:60
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:127
+#: tools/gpg-connect-agent.c:74
+#, fuzzy
+msgid "|FILE|run commands from FILE on startup"
+msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
+
+#: tools/gpg-connect-agent.c:75
+msgid "run /subst on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:174
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: tools/gpg-connect-agent.c:130
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:314
+#: tools/gpg-connect-agent.c:1155
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:323
+#: tools/gpg-connect-agent.c:1164
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:381
+#: tools/gpg-connect-agent.c:1219 tools/gpg-connect-agent.c:1645
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "fallou o borrado do bloque de chaves: %s\n"
+
+#: tools/gpg-connect-agent.c:1299
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "li�a longa de m�is\n"
 
-#: tools/gpg-connect-agent.c:385
+#: tools/gpg-connect-agent.c:1303
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:1619
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
 
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:1637
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: tools/gpg-connect-agent.c:473
-#, fuzzy, c-format
-msgid "receiving line failed: %s\n"
-msgstr "fallou o borrado do bloque de chaves: %s\n"
-
-#: tools/gpg-connect-agent.c:789
+#: tools/gpg-connect-agent.c:1986
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:798
+#: tools/gpg-connect-agent.c:1995
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
-#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
+#: tools/gpgconf-comp.c:459 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:773
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:796
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
-#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
+#: tools/gpgconf-comp.c:482 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:803
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "habilitar depuraci�n total"
 
-#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
-#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:487 tools/gpgconf-comp.c:606 tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:729 tools/gpgconf-comp.c:811
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:737
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:504
+#: tools/gpgconf-comp.c:502
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:506
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:512
+#: tools/gpgconf-comp.c:510
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:526
+#: tools/gpgconf-comp.c:524
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:527
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:531
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:535
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:539
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:543
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|emprega-lo modo de contrasinal N"
 
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:547
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:710
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOME|cifrar para NOME"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:669
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:674
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:719
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME para os contrasinais"
 
-#: tools/gpgconf-comp.c:744
+#: tools/gpgconf-comp.c:742
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:786
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:824
+#: tools/gpgconf-comp.c:822
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:834
+#: tools/gpgconf-comp.c:832
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:845
+#: tools/gpgconf-comp.c:843
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:850
+#: tools/gpgconf-comp.c:848
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:887
+#: tools/gpgconf-comp.c:885
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2982
+#: tools/gpgconf-comp.c:3006
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:59
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
+#, fuzzy
+msgid "list global configuration file"
+msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
+
+#: tools/gpgconf.c:67
 #, fuzzy
 msgid "check global configuration file"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:71
+msgid "use as output file"
+msgstr "usar coma ficheiro de sa�da"
+
+#: tools/gpgconf.c:75
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:100
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:176 tools/gpgconf.c:209
+#: tools/gpgconf.c:202 tools/gpgconf.c:240
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: tools/gpgconf.c:178
+#: tools/gpgconf.c:204
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:187
+#: tools/gpgconf.c:213
 #, fuzzy
 msgid "Component not found"
 msgstr "non se atopou a chave p�blica"
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:242
 #, fuzzy
 msgid "No argument allowed"
 msgstr "gravando a chave secreta en `%s'\n"
@@ -8142,92 +8188,110 @@ msgstr "erro lendo `%s': %s\n"
 msgid "error closing %s: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: tools/symcryptrun.c:515
+#: tools/symcryptrun.c:486
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "non se soporta a execuci�n remota de programas\n"
 
-#: tools/symcryptrun.c:521
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:556
+#: tools/symcryptrun.c:527
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: tools/symcryptrun.c:563
+#: tools/symcryptrun.c:534
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: tools/symcryptrun.c:579
+#: tools/symcryptrun.c:550
 #, fuzzy, c-format
 msgid "could not fork: %s\n"
 msgstr "%s: non se atopou o usuario: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:578
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: tools/symcryptrun.c:636
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: tools/symcryptrun.c:653
+#: tools/symcryptrun.c:624
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: tools/symcryptrun.c:705
+#: tools/symcryptrun.c:676
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: tools/symcryptrun.c:757
+#: tools/symcryptrun.c:728
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: tools/symcryptrun.c:771
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:826
+#: tools/symcryptrun.c:797
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: tools/symcryptrun.c:839
+#: tools/symcryptrun.c:810
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: tools/symcryptrun.c:1014
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1041
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1050
+#: tools/symcryptrun.c:1021
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "non se pode po�er datos de notaci�n nas sinaturas v3 (estilo PGP 2.x)\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "non se pode po�er datos de notaci�n nas sinaturas de chave v3 (estilo PGP "
+#~ "2.x)\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "non se pode po�er un URL de pol�tica nas sinaturas v3 (estilo PGP 2.x)\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "non se pode po�er un URL de pol�tica nas sinaturas de chave v3 (estilo "
+#~ "PGP 2.x)\n"
+
 #, fuzzy
 #~ msgid "shelll"
 #~ msgstr "axuda"
diff --git a/po/hu.po b/po/hu.po
index b79e7173c..18551ee50 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-09-14 13:27+0200\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
 "PO-Revision-Date: 2004-06-19 21:53+0200\n"
 "Last-Translator: Nagy Ferenc L�szl� <nfl@nfllab.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -14,59 +14,75 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: agent/call-pinentry.c:438
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:441
+#: agent/call-pinentry.c:551
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: agent/call-pinentry.c:489
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+msgid "Quality:"
+msgstr ""
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 #, fuzzy
 msgid "PIN too long"
 msgstr "A sor t�l hossz�!\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:668
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "A jelsz� t�l hossz�!\n"
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:676
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "�rv�nytelen karakter a n�vben!\n"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:535
+#: agent/call-pinentry.c:693
 #, fuzzy
 msgid "Bad PIN"
 msgstr "hib�s MPI"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:694
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "rossz jelsz�"
 
-#: agent/call-pinentry.c:572
+#: agent/call-pinentry.c:730
 #, fuzzy
 msgid "Passphrase"
 msgstr "rossz jelsz�"
@@ -76,21 +92,21 @@ msgstr "rossz jelsz�"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
-#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1865
-#: sm/gpgsm.c:1902 sm/gpgsm.c:1940 sm/qualified.c:72
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
@@ -130,14 +146,25 @@ msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: agent/command-ssh.c:2349
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "jelsz�v�ltoztat�s"
+
+#: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2850
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/command-ssh.c:2885
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: Hasht�bla l�trehoz�sa sikertelen: %s.\n"
@@ -182,76 +209,66 @@ msgstr "�rja be a jelsz�t!\n"
 msgid "Take this one anyway"
 msgstr "M�gis haszn�ljuk ezt a kulcsot? "
 
-#: agent/genkey.c:185
+#: agent/genkey.c:191
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u character long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u characters long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:202
+#: agent/genkey.c:212
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digit or special character."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digits or special characters."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:225
+#: agent/genkey.c:235
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
-"passphrase may not%0Abe a known term or match certain pattern."
+"Warning: You have entered an insecure passphrase.%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:238
+#: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:240
+#: agent/genkey.c:253
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:246
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:290
+#: agent/genkey.c:306
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Most sz�ks�g van egy jelsz�ra (vagy mondatra), amely a titkos kulcs�t v�di.\n"
 "\n"
 
-#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "jelsz�v�ltoztat�s"
-
-#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
-#: tools/symcryptrun.c:456
-msgid "does not match - try again"
-msgstr ""
-
-#: agent/genkey.c:412
+#: agent/genkey.c:429
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:104
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -261,66 +278,65 @@ msgstr ""
 "Opci�k:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:109
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:69 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "b�besz�d� m�d"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:341
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "m�g sz�kszav�bb m�d"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:112
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:113
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|f�jl|b�v�t� modul bet�lt�se"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
-#: tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "kulcsok keres�se kulcsszerveren"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:134
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "bizalmi adatb�zis friss�t�se"
@@ -358,150 +374,165 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:91 tools/symcryptrun.c:204
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "A hib�kat (angolul) a <gnupg-bugs@gnu.org> c�mre �rja meg!\n"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:512 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:340 sm/gpgsm.c:819 sm/gpgsm.c:822 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, 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:610 agent/gpg-agent.c:1177 g10/gpg.c:2027
-#: scd/scdaemon.c:421 sm/gpgsm.c:914 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: agent/gpg-agent.c:947 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
 
-#: agent/gpg-agent.c:1247 agent/gpg-agent.c:1373 agent/gpg-agent.c:1377
-#: agent/gpg-agent.c:1418 agent/gpg-agent.c:1422 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:908
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
+#: agent/gpg-agent.c:1321
+#, c-format
+msgid "socket name `%s' is too long\n"
+msgstr ""
+
+#: agent/gpg-agent.c:1333
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
+#, fuzzy
+msgid "error getting nonce for the socket\n"
+msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
 
-#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: K�nyvt�rat l�trehoztam.\n"
 
-#: agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1448
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
 
-#: agent/gpg-agent.c:1438
+#: agent/gpg-agent.c:1452
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: Nem tudom a k�nyvt�rat l�trehozni: %s.\n"
 
-#: agent/gpg-agent.c:1549
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
+#, fuzzy, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1554
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1571
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1576
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
 
-#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: kihagyva: %s\n"
 
-#: agent/gpg-agent.c:1809
+#: agent/gpg-agent.c:1850
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:756
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "Nem megfelel� form�j� GPG_AGENT_INFO k�rnyezeti v�ltoz�!\n"
 
-#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
-#: tools/gpg-connect-agent.c:767
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
@@ -528,40 +559,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1188
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1191
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: agent/protect-tool.c:1216
+#: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1221
+#: agent/protect-tool.c:1199
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "rossz jelsz�"
 
-#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "M�gsem"
@@ -673,7 +704,8 @@ msgstr "jelsz�v�ltoztat�s"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1338
+#: tools/gpgconf-comp.c:1641
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
@@ -822,77 +854,82 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:366
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr "P�nc�l: %s\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr "�rv�nytelen p�nc�lfejl�c: "
 
-#: g10/armor.c:416
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr "P�nc�lfejl�c: "
 
-#: g10/armor.c:427
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr "�rv�nytelen al��r�sfejl�c!\n"
 
-#: g10/armor.c:479
+#: g10/armor.c:455
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "P�nc�lfejl�c: "
+
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr "Egym�sba �gyazott olvashat�sz�veg-al��r�sok!\n"
 
-#: g10/armor.c:614
+#: g10/armor.c:643
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "V�ratlan p�nc�l:"
 
-#: g10/armor.c:626
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr "�rv�nytelen k�t�jeles sor: "
 
-#: g10/armor.c:780 g10/armor.c:1390
+#: g10/armor.c:809 g10/armor.c:1419
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "Kihagytam a %02x k�d� �rv�nytelen radix64 karaktert.\n"
 
-#: g10/armor.c:823
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr "Korai �llom�nyv�g (nincs CRC).\n"
 
-#: g10/armor.c:857
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr "Korai �llom�nyv�g (a CRC-ben).\n"
 
-#: g10/armor.c:865
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr "Hib�s form�j� CRC.\n"
 
-#: g10/armor.c:869 g10/armor.c:1427
+#: g10/armor.c:898 g10/armor.c:1456
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC hiba; %06lx - %06lx\n"
 
-#: g10/armor.c:889
+#: g10/armor.c:918
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "Korai �llom�nyv�g (a lez�r�sban).\n"
 
-#: g10/armor.c:893
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr "Hiba a z�r� sorban!\n"
 
-#: g10/armor.c:1204
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: g10/armor.c:1209
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "�rv�nytelen p�nc�l: %d karaktern�l hosszabb sor.\n"
 
-#: g10/armor.c:1213
+#: g10/armor.c:1242
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1237,11 +1274,11 @@ msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 
-#: g10/decrypt.c:110 g10/encode.c:890
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
@@ -1252,7 +1289,7 @@ msgstr "Nem tudom megnyitni %s-t!\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1295,7 +1332,7 @@ msgstr "Van egy titkos kulcs a \"%s\" nyilv�nos kulcshoz!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "El�sz�r azt t�r�lje a \"--delete-secret-keys\" opci�val!\n"
 
-#: g10/encode.c:226 g10/sign.c:1296
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
@@ -1314,7 +1351,7 @@ msgstr "%s rejtjelez�st haszn�lok.\n"
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" m�r t�m�r�tett.\n"
 
-#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "FIGYELEM: A(z) \"%s\" �llom�ny �res.\n"
@@ -1340,24 +1377,24 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "A %s (%d) rejtjelez� haszn�lata s�rti a c�mzett preferenci�it!\n"
 
-#: g10/encode.c:669 g10/sign.c:966
+#: g10/encode.c:655 g10/sign.c:936
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "A %s (%d) t�m�r�t�s haszn�lata s�rti a c�mzett preferenci�it!\n"
 
-#: g10/encode.c:765
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "A %s (%d) rejtjelez� haszn�lata s�rti a c�mzett preferenci�it!\n"
 
-#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/encode.c:862
+#: g10/encode.c:848
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s titkos�tva \"%s\" sz�m�ra\n"
@@ -1548,7 +1585,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:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1556,133 +1593,133 @@ msgstr ""
 "@Parancsok:\n"
 " "
 
-#: g10/gpg.c:370
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[f�jl]|al��r�s k�sz�t�se"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
 
-#: g10/gpg.c:372 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "k�l�n�ll� al��r�s k�sz�t�se"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "adat titkos�t�sa"
 
-#: g10/gpg.c:375 sm/gpgsm.c:248
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
 
-#: g10/gpg.c:377 sm/gpgsm.c:249
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "adat visszafejt�se (alap�rtelmez�s)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "al��r�s ellen�rz�se"
 
-#: g10/gpg.c:381 sm/gpgsm.c:252
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "kulcsok list�z�sa"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "kulcsok �s al��r�sok list�z�sa"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kulcsal��r�sok ellen�rz�se"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "kulcsok �s ujjlenyomatok list�z�sa"
 
-#: g10/gpg.c:386 sm/gpgsm.c:254
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "titkos kulcsok list�z�sa"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "remove keys from the public keyring"
 msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "remove keys from the secret keyring"
 msgstr "kulcsok elt�vol�t�sa a titkoskulcs-karik�r�l"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "kulcs al��r�sa"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "kulcs al��r�sa helyileg"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "kulcs al��r�sa vagy szerkeszt�se"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "visszavon�si igazol�s k�sz�t�se"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "kulcsok export�l�sa"
 
-#: g10/gpg.c:397 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "kulcsok export�l�sa kulcsszerverre"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "kulcsok import�l�sa kulcsszerverr�l"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:402
 msgid "search for keys on a key server"
 msgstr "kulcsok keres�se kulcsszerveren"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "update all keys from a keyserver"
 msgstr "minden kulcs friss�t�se kulcsszerverr�l"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "kulcsok import�l�sa/�sszef�z�se"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:410
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr "bizalmi adatb�zis friss�t�se"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
 
-#: g10/gpg.c:430 sm/gpgsm.c:264
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1692,47 +1729,48 @@ msgstr ""
 "Opci�k:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:281
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
 
-#: g10/gpg.c:436 sm/gpgsm.c:293
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|N�V|titkos�t�s N�V r�sz�re"
 
-#: g10/gpg.c:447 sm/gpgsm.c:331
+#: g10/gpg.c:449 sm/gpgsm.c:333
 msgid "use this user-id to sign or decrypt"
 msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
 
-#: g10/gpg.c:448 sm/gpgsm.c:334
+#: g10/gpg.c:450 sm/gpgsm.c:336
 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:453 sm/gpgsm.c:336
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr "kanonikus sz�veges m�d haszn�lata"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
-msgid "use as output file"
-msgstr "kimeneti �llom�ny megad�sa"
+#: g10/gpg.c:469 sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "|f�jl|b�v�t� modul bet�lt�se"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "ne csin�ljon semmi v�ltoztat�st"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "fel�l�r�s el�tt r�k�rdez�s"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:524
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:397
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1740,7 +1778,7 @@ msgstr ""
 "@\n"
 "(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:400
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1760,15 +1798,15 @@ msgstr ""
 " --list-keys [nevek]        kulcsok ki�rat�sa\n"
 " --fingerprint [nevek]      ujjlenyomatok ki�rat�sa\n"
 
-#: g10/gpg.c:750 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "A hib�kat (angolul) a <gnupg-bugs@gnu.org> c�mre �rja meg!\n"
 
-#: g10/gpg.c:767
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1778,7 +1816,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:781 sm/gpgsm.c:578
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1786,558 +1824,562 @@ msgstr ""
 "\n"
 "T�mogatott algoritmusok:\n"
 
-#: g10/gpg.c:784
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr "Nyilv�nos kulcs� (pubkey): "
 
-#: g10/gpg.c:791 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Rejtjelez� (cipher): "
 
-#: g10/gpg.c:798
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr "Kivonatol� (hash): "
 
-#: g10/gpg.c:805 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "T�m�r�t� (compression): "
 
-#: g10/gpg.c:875
+#: g10/gpg.c:817 sm/gpgsm.c:603
+msgid "Used libraries:"
+msgstr ""
+
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:715
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/gpg.c:1063
+#: g10/gpg.c:1113
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "Nem tal�ltam = jelet a \"%s\" csoportdefin�ci�ban!\n"
 
-#: g10/gpg.c:1260
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1263
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1266
+#: g10/gpg.c:1316
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1272
+#: g10/gpg.c:1322
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1325
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1328
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1284
+#: g10/gpg.c:1334
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1337
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1340
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1296
+#: g10/gpg.c:1346
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1349
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1352
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1445
+#: g10/gpg.c:1495
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1594
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1602
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1610
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mutatja a kilist�zott kulcs kulcskarik�j�t is"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1612
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1825
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1981
+#: g10/gpg.c:2030
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MEGJEGYZ�S: Figyelmen k�v�l hagytam a r�gi opci�kat (%s).\n"
 
-#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MEGJEGYZ�S: %s nem norm�l haszn�latra van!\n"
 
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2493
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/gpg.c:2528
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2610
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2613
 msgid "invalid import options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2620
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2551
+#: g10/gpg.c:2623
 msgid "invalid export options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2630
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2561
+#: g10/gpg.c:2633
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2645
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2653
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2655
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2659
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2670
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2673
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Nem tudom a v�grehajt�si el�r�si utat %s �rt�kre �ll�tani!\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2855
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1298
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �rtelmetlen %s mellett!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2975
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "Csak k�l�n�ll� �s olvashat�sz�veg-al��r�st k�sz�thet --pgp2 m�dban!\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Nem �rhat al� �s titkos�that egyszerre --pgp2 m�dban!\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Csak �llom�nyokat (pipe-ot nem) haszn�lhat --pgp2 m�dban!\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:3014
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1370
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1378
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3092
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3098
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3117
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 1 �s 255 k�z� kell essen!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3119
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�rv�nytelen default-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3121
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�rv�nytelen min-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MEGJEGYZ�S: Egyszer� S2K m�d (0) er�sen ellenjavallt!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�rv�nytelen S2K m�d; 0, 1 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3135
 msgid "invalid default preferences\n"
 msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3144
 msgid "invalid personal cipher preferences\n"
 msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3148
 msgid "invalid personal digest preferences\n"
 msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3152
 msgid "invalid personal compress preferences\n"
 msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3185
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s �s %s egyel�re nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3232
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "Lehet, hogy nem haszn�lhatja \"%s\" rejtjelez� algoritmust %s m�dban!\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3237
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "Lehet, hogy nem haszn�lhatja \"%s\" kivonatol� algoritmust %s m�dban!\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3242
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja \"%s\" t�m�r�t� algoritmust %s m�dban!\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "FIGYELEM: C�mzett megadva (-r), de nincs nyilv�nos kulcs� titkos�t�s!\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [f�jln�v]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [f�jln�v]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3375
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [f�jln�v]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3403
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--sign [f�jln�v]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3449
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3454
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3474
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [f�jln�v]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [f�jln�v]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [f�jln�v]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonos�t�"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonos�t� [parancsok]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3630
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexport�l�s sikertelen: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3641
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3651
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[f�jln�v]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti g�pelni az �zenetet...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4233
 msgid "the given certification policy URL is invalid\n"
 msgstr "A megadott igazol�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4235
 msgid "the given signature policy URL is invalid\n"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4268
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
@@ -2350,7 +2392,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:75 sm/gpgsm.c:372
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr "|�L|�llapotinform�ci�k �r�sa �L �llom�nyle�r�ra"
 
@@ -2882,13 +2924,13 @@ msgstr "%08lX kulcs: �j kulcs - kihagytam.\n"
 msgid "no writable keyring found: %s\n"
 msgstr "Nem �rhat� kulcskarik�t tal�ltam: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2369 g10/import.c:2391
+#: g10/import.c:2381 g10/import.c:2403
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
@@ -2979,7 +3021,7 @@ msgstr ""
 msgid "importing secret keys not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/import.c:1158 g10/import.c:2384
+#: g10/import.c:1158 g10/import.c:2396
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Nincs alap�rtelmezett titkoskulcs-karika: %s\n"
@@ -3101,46 +3143,46 @@ msgstr "%08lX kulcs: Alkulcsal��r�s rossz helyen - kihagytam.\n"
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "%08lX kulcs: V�ratlan al��r�soszt�ly (0x%02X) - kihagytam.\n"
 
-#: g10/import.c:1732
+#: g10/import.c:1744
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "%08lX kulcs: Dupl�zott felh. azonos�t�t tal�ltam - �sszef�ztem.\n"
 
-#: g10/import.c:1794
+#: g10/import.c:1806
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
 "leh�vom a %08lX visszavon� kulcsot.\n"
 
-#: g10/import.c:1808
+#: g10/import.c:1820
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
 "visszavon� kulcs (%08lX) nincs jelen.\n"
 
-#: g10/import.c:1867
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st hozz�adtam.\n"
 
-#: g10/import.c:1901
+#: g10/import.c:1913
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2302
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "A nyilv�nos kulcs nem passzol a titkos kulcshoz!\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2310
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2312
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
@@ -3465,7 +3507,7 @@ msgid "Really sign? (y/N) "
 msgstr "Val�ban al��rja? "
 
 #: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:348
+#: g10/keyedit.c:5019 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Al��r�s sikertelen: %s\n"
@@ -3828,8 +3870,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Val�ban visszavonja ezt a kulcsot? "
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
 #: g10/keyedit.c:2140
@@ -4713,14 +4754,14 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:273
+#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:275
+#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5328,17 +5369,17 @@ msgstr "t�m�r�tetlen"
 msgid "uncompressed|none"
 msgstr "t�m�r�tetlen"
 
-#: g10/misc.c:874
+#: g10/misc.c:891
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "Lehet, hogy ez az �zenet haszn�lhatatlan a %s sz�m�ra!\n"
 
-#: g10/misc.c:1049
+#: g10/misc.c:1066
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: g10/misc.c:1074
+#: g10/misc.c:1091
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
@@ -5397,14 +5438,14 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "A %d t�pus� alcsomag kritikus bitje be�ll�tott.\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:603
+#: g10/passphrase.c:295 g10/passphrase.c:581
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr ""
 " \n"
 "  (f� kulcsazonos�t�: %08lX)"
 
-#: g10/passphrase.c:327
+#: g10/passphrase.c:309
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5416,24 +5457,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u bites %s key, azonos�t�: %08lX, l�trehozva: %s%s\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:334
 msgid "Repeat passphrase\n"
 msgstr "Ism�telje meg a jelsz�t!\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:336
 msgid "Enter passphrase\n"
 msgstr "�rja be a jelsz�t!\n"
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:363
 msgid "cancelled by user\n"
 msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
 
-#: g10/passphrase.c:384 g10/passphrase.c:450
+#: g10/passphrase.c:369 g10/passphrase.c:428
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
 
-#: g10/passphrase.c:582
+#: g10/passphrase.c:560
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5444,12 +5485,12 @@ msgstr ""
 "haszn�lat�hoz:\n"
 "\""
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:568
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u bites %s kulcs, azonos�t�: %08lX, l�trehozva: %s."
 
-#: g10/passphrase.c:599
+#: g10/passphrase.c:577
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6084,31 +6125,14 @@ msgstr "%08lX kulcs: Nincs alkulcs az alkulcsvisszavon� csomaghoz.\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "%08lX kulcs: Nincs alkulcs az alkulcsk�t� al��r�shoz!\n"
 
-#: g10/sign.c:82
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "Nem tehet jel�l�adatot a v3-as (PGP 2.x st�lus�) al��r�sokba!\n"
-
-#: g10/sign.c:90
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "Nem tehet jel�l�adatot a v3-as (PGP 2.x st�lus�) kulcsal��r�sokba!\n"
-
-#: g10/sign.c:104
+#: g10/sign.c:89
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "FIGYELEM: Nem tudom kifejteni a %% jeleket a jel�l�sben (t�l hossz�).\n"
 "Kifejt�s n�lk�l haszn�lom.\n"
 
-#: g10/sign.c:121
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "Nem tehet elj�r�sm�d-URL-t a v3-as (PGP 2.x st�lus�) al��r�sokba!\n"
-
-#: g10/sign.c:129
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-"Nem tehet elj�r�sm�d-URL-t a v3-as (PGP 2.x st�lus�) kulcsal��r�sokba!\n"
-
-#: g10/sign.c:142
+#: g10/sign.c:115
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6117,7 +6141,7 @@ msgstr ""
 "hossz�).\n"
 "Kifejt�s n�lk�l haszn�lom.\n"
 
-#: g10/sign.c:170
+#: g10/sign.c:138
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6127,22 +6151,22 @@ msgstr ""
 "hossz�).\n"
 "Kifejt�s n�lk�l haszn�lom.\n"
 
-#: g10/sign.c:343
+#: g10/sign.c:311
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
 
-#: g10/sign.c:352
+#: g10/sign.c:320
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s al��r�s a k�vetkez�t�l: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "K�l�n�ll� al��r�st PGP 2.x st�lus� kulcsokkal csak --pgp2 m�dban k�sz�thet!\n"
 
-#: g10/sign.c:864
+#: g10/sign.c:834
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6150,16 +6174,16 @@ msgstr ""
 "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
 "a c�mzett preferenci�ival.\n"
 
-#: g10/sign.c:991
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "Al��rom:"
 
-#: g10/sign.c:1106
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Olvashat� sz�veget PGP 2.x st�lus� kulccsal csak --pgp2 m�dban �rhat al�!\n"
 
-#: g10/sign.c:1290
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s titkos�t�st fogok haszn�lni.\n"
@@ -6872,64 +6896,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:114 sm/gpgsm.c:361
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 #, fuzzy
 msgid "read options from file"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "ne haszn�lja a termin�lt egy�ltal�n"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:135
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: scd/scdaemon.c:209
+#: scd/scdaemon.c:210
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: scd/scdaemon.c:211
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:658
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1006
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1011
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6963,11 +6987,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1631
+#: sm/certchain.c:195 sm/certchain.c:1646
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1631
+#: sm/certchain.c:196 sm/certchain.c:1646
 #, fuzzy
 msgid "shell"
 msgstr "help"
@@ -7008,8 +7032,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
@@ -7177,7 +7201,7 @@ msgstr ""
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1730
+#: sm/certchain.c:1462 sm/certchain.c:1745
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "%c%lu preferencia k�tszer szerepel!\n"
@@ -7192,11 +7216,11 @@ msgstr "Visszavon� igazol�s l�trehozva.\n"
 msgid "root certificate is good\n"
 msgstr "rossz igazol�s"
 
-#: sm/certchain.c:1620
+#: sm/certchain.c:1635
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1629
+#: sm/certchain.c:1644
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7211,7 +7235,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7225,25 +7249,25 @@ msgstr "nem"
 msgid "[none]"
 msgstr "Ismeretlen m�d�"
 
-#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
+#: sm/certdump.c:583 sm/certdump.c:628 sm/certdump.c:693 sm/certdump.c:746
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: sm/certdump.c:558 sm/certdump.c:603
+#: sm/certdump.c:591 sm/certdump.c:636
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:640 sm/certdump.c:696
+#: sm/certdump.c:673 sm/certdump.c:729
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:665 sm/certdump.c:719
+#: sm/certdump.c:698 sm/certdump.c:752
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: sm/certdump.c:936
+#: sm/certdump.c:946
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7371,181 +7395,190 @@ msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 msgid "no valid recipients given\n"
 msgstr "(Nincs le�r�s.)\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[f�jl]|al��r�s k�sz�t�se"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list external keys"
 msgstr "titkos kulcsok list�z�sa"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
 #, fuzzy
 msgid "list certificate chain"
 msgstr "rossz igazol�s"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:260
 #, 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:263
 #, fuzzy
 msgid "import certificates"
 msgstr "rossz igazol�s"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "export certificates"
 msgstr "rossz igazol�s"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:270
 #, fuzzy
 msgid "change a passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 msgid "|NAME|use NAME as default recipient"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "use the default key as default recipient"
 msgstr "alap�rt. kulcs haszn. alap�rt. c�mzettk�nt"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr "ne haszn�lja a termin�lt egy�ltal�n"
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:345
+msgid "|FILE|write a server mode log to FILE"
+msgstr ""
+
+#: sm/gpgsm.c:347
+#, fuzzy
+msgid "|FILE|write an audit log to FILE"
+msgstr "|f�jl|b�v�t� modul bet�lt�se"
+
+#: sm/gpgsm.c:349
 msgid "force v3 signatures"
 msgstr "3-as verzi�j� al��r�sok er�ltet�se"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr "mindig haszn�ljon MDC-t titkos�t�skor"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr "k�tegelt m�d: soha nem k�rdez"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr "igen v�lasz felt�telez�se a legt�bb k�rd�sre"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr "nem v�lasz felt�telez�se a legt�bb k�rd�sre"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:359
 msgid "add this keyring to the list of keyrings"
 msgstr "kulcskarika hozz�ad�sa a kulcskarikalist�hoz"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:360
 msgid "add this secret keyring to the list"
 msgstr "titkoskulcs-karika hozz�ad�sa a list�hoz"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett titkos kulcsk�nt"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|G�PN�V|kulcsszerver be�ll�t�sa kulcsok keres�s�hez"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:363
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|N�V|termin�l karakterk�dol�s�nak megad�sa"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:379
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr "|f�jl|b�v�t� modul bet�lt�se"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:388
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|N�V|N�V rejtjelez� algoritmus haszn�lata"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:390
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|N�V|N�V kivonatol� algoritmus haszn�lata"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:392
 msgid "|N|use compress algorithm N"
 msgstr "|N|N. sorsz�m� t�m�r�t� algoritmus haszn�lata"
 
-#: sm/gpgsm.c:568
+#: sm/gpgsm.c:573
 #, 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:571
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7556,36 +7589,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:650
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: sm/gpgsm.c:748
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
 
-#: sm/gpgsm.c:759
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
 
-#: sm/gpgsm.c:1315
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1411
+#: sm/gpgsm.c:1468
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: sm/gpgsm.c:1429
+#: sm/gpgsm.c:1486
 #, 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:1612
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7608,7 +7641,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:1274
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@ -7671,17 +7704,17 @@ msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:111
+#: sm/qualified.c:105
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: sm/qualified.c:129
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:225
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7692,13 +7725,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234 sm/verify.c:536
+#: sm/qualified.c:209 sm/verify.c:580
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:327
+#: sm/qualified.c:277
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7711,293 +7744,311 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:424
 #, fuzzy
 msgid "Signature made "
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:428
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:429
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: sm/verify.c:514
+#: sm/verify.c:558
 #, fuzzy
 msgid "Good signature from"
 msgstr "J� al��r�s a k�vetkez�t�l: \""
 
-#: sm/verify.c:515
+#: sm/verify.c:559
 #, fuzzy
 msgid "                aka"
 msgstr "               azaz \""
 
-#: sm/verify.c:533
+#: sm/verify.c:577
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr ""
 "\n"
 "Ez egy �nal��r�s lesz.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "kil�p�s|kilepes"
 
-#: tools/gpg-connect-agent.c:60
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:127
+#: tools/gpg-connect-agent.c:74
+#, fuzzy
+msgid "|FILE|run commands from FILE on startup"
+msgstr "|f�jl|b�v�t� modul bet�lt�se"
+
+#: tools/gpg-connect-agent.c:75
+msgid "run /subst on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:174
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: tools/gpg-connect-agent.c:130
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:314
+#: tools/gpg-connect-agent.c:1155
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:323
+#: tools/gpg-connect-agent.c:1164
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:381
+#: tools/gpg-connect-agent.c:1219 tools/gpg-connect-agent.c:1645
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+
+#: tools/gpg-connect-agent.c:1299
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "A sor t�l hossz�!\n"
 
-#: tools/gpg-connect-agent.c:385
+#: tools/gpg-connect-agent.c:1303
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:1619
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:1637
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "Al��r�s sikertelen: %s\n"
 
-#: tools/gpg-connect-agent.c:473
-#, fuzzy, c-format
-msgid "receiving line failed: %s\n"
-msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
-
-#: tools/gpg-connect-agent.c:789
+#: tools/gpg-connect-agent.c:1986
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
 
-#: tools/gpg-connect-agent.c:798
+#: tools/gpg-connect-agent.c:1995
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
 
-#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
-#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
+#: tools/gpgconf-comp.c:459 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:773
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:796
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
-#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
+#: tools/gpgconf-comp.c:482 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:803
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
-#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:487 tools/gpgconf-comp.c:606 tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:729 tools/gpgconf-comp.c:811
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:737
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:504
+#: tools/gpgconf-comp.c:502
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:506
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:512
+#: tools/gpgconf-comp.c:510
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:526
+#: tools/gpgconf-comp.c:524
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:527
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:531
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:535
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:539
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:543
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|N. sorsz�m� jelsz�m�d haszn�lata"
 
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:547
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:710
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|N�V|titkos�t�s N�V r�sz�re"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:669
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:674
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:719
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|N�V|N�V rejtjelez� algoritmus haszn. jelszavakhoz"
 
-#: tools/gpgconf-comp.c:744
+#: tools/gpgconf-comp.c:742
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:786
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:824
+#: tools/gpgconf-comp.c:822
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:834
+#: tools/gpgconf-comp.c:832
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:845
+#: tools/gpgconf-comp.c:843
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:850
+#: tools/gpgconf-comp.c:848
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:887
+#: tools/gpgconf-comp.c:885
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2982
+#: tools/gpgconf-comp.c:3006
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:59
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
+#, fuzzy
+msgid "list global configuration file"
+msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
+
+#: tools/gpgconf.c:67
 #, fuzzy
 msgid "check global configuration file"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:71
+msgid "use as output file"
+msgstr "kimeneti �llom�ny megad�sa"
+
+#: tools/gpgconf.c:75
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:100
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:176 tools/gpgconf.c:209
+#: tools/gpgconf.c:202 tools/gpgconf.c:240
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: tools/gpgconf.c:178
+#: tools/gpgconf.c:204
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:187
+#: tools/gpgconf.c:213
 #, fuzzy
 msgid "Component not found"
 msgstr "nyilv�nos kulcs nem tal�lhat�"
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:242
 #, fuzzy
 msgid "No argument allowed"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
@@ -8091,92 +8142,106 @@ msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 msgid "error closing %s: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: tools/symcryptrun.c:515
+#: tools/symcryptrun.c:486
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "K�ls� program megh�v�sa nem t�mogatott.\n"
 
-#: tools/symcryptrun.c:521
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:556
+#: tools/symcryptrun.c:527
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: tools/symcryptrun.c:563
+#: tools/symcryptrun.c:534
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: tools/symcryptrun.c:579
+#: tools/symcryptrun.c:550
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:578
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: tools/symcryptrun.c:636
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: tools/symcryptrun.c:653
+#: tools/symcryptrun.c:624
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: tools/symcryptrun.c:705
+#: tools/symcryptrun.c:676
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: tools/symcryptrun.c:757
+#: tools/symcryptrun.c:728
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: tools/symcryptrun.c:771
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:826
+#: tools/symcryptrun.c:797
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: tools/symcryptrun.c:839
+#: tools/symcryptrun.c:810
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: tools/symcryptrun.c:1014
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1041
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1050
+#: tools/symcryptrun.c:1021
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "Nem tehet jel�l�adatot a v3-as (PGP 2.x st�lus�) al��r�sokba!\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "Nem tehet jel�l�adatot a v3-as (PGP 2.x st�lus�) kulcsal��r�sokba!\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "Nem tehet elj�r�sm�d-URL-t a v3-as (PGP 2.x st�lus�) al��r�sokba!\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "Nem tehet elj�r�sm�d-URL-t a v3-as (PGP 2.x st�lus�) kulcsal��r�sokba!\n"
+
 #, fuzzy
 #~ msgid "shelll"
 #~ msgstr "help"
diff --git a/po/id.po b/po/id.po
index 8c62e065f..d004aad71 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-09-14 13:27+0200\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -16,59 +16,75 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: agent/call-pinentry.c:438
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:441
+#: agent/call-pinentry.c:551
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/call-pinentry.c:489
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+msgid "Quality:"
+msgstr ""
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 #, fuzzy
 msgid "PIN too long"
 msgstr "baris terlalu panjang\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:668
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "passphrase terlalu panjang\n"
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:676
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:535
+#: agent/call-pinentry.c:693
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI yang buruk"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:694
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "passphrase yang buruk"
 
-#: agent/call-pinentry.c:572
+#: agent/call-pinentry.c:730
 #, fuzzy
 msgid "Passphrase"
 msgstr "passphrase yang buruk"
@@ -78,21 +94,21 @@ msgstr "passphrase yang buruk"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
-#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1865
-#: sm/gpgsm.c:1902 sm/gpgsm.c:1940 sm/qualified.c:72
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
@@ -132,14 +148,25 @@ msgstr "kesalahan menulis keyring `%s': %s\n"
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/command-ssh.c:2349
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "ubah passphrase"
+
+#: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2850
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/command-ssh.c:2885
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
@@ -184,76 +211,66 @@ msgstr "Masukkan passphrase\n"
 msgid "Take this one anyway"
 msgstr "Tetap gunakan kunci ini? "
 
-#: agent/genkey.c:185
+#: agent/genkey.c:191
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u character long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u characters long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:202
+#: agent/genkey.c:212
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digit or special character."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digits or special characters."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:225
+#: agent/genkey.c:235
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
-"passphrase may not%0Abe a known term or match certain pattern."
+"Warning: You have entered an insecure passphrase.%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:238
+#: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:240
+#: agent/genkey.c:253
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:246
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:290
+#: agent/genkey.c:306
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "ubah passphrase"
-
-#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
-#: tools/symcryptrun.c:456
-msgid "does not match - try again"
-msgstr ""
-
-#: agent/genkey.c:412
+#: agent/genkey.c:429
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "ubah passphrase"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:104
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -263,66 +280,65 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:109
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:69 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detil"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:341
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:112
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:113
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
-#: tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cari kunci di key server"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:134
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "perbarui database trust"
@@ -360,150 +376,165 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:91 tools/symcryptrun.c:204
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Laporkan bug ke <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:512 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:340 sm/gpgsm.c:819 sm/gpgsm.c:822 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: agent/gpg-agent.c:610 agent/gpg-agent.c:1177 g10/gpg.c:2027
-#: scd/scdaemon.c:421 sm/gpgsm.c:914 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: agent/gpg-agent.c:947 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: agent/gpg-agent.c:1247 agent/gpg-agent.c:1373 agent/gpg-agent.c:1377
-#: agent/gpg-agent.c:1418 agent/gpg-agent.c:1422 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:908
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
+#: agent/gpg-agent.c:1321
+#, c-format
+msgid "socket name `%s' is too long\n"
+msgstr ""
+
+#: agent/gpg-agent.c:1333
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
+#, fuzzy
+msgid "error getting nonce for the socket\n"
+msgstr "kesalahan penciptaan passphrase: %s\n"
+
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: direktori tercipta\n"
 
-#: agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1448
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1438
+#: agent/gpg-agent.c:1452
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: tidak dapat membuat direktori: %s\n"
 
-#: agent/gpg-agent.c:1549
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
+#, fuzzy, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "kesalahan membaca `%s': %s\n"
+
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1554
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1571
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1576
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: dilewati: %s\n"
 
-#: agent/gpg-agent.c:1809
+#: agent/gpg-agent.c:1850
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:756
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 
-#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
-#: tools/gpg-connect-agent.c:767
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokol gpg-agent versi %d tidak didukung\n"
@@ -530,40 +561,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1188
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1191
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/protect-tool.c:1216
+#: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1221
+#: agent/protect-tool.c:1199
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "passphrase yang buruk"
 
-#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Batal"
@@ -675,7 +706,8 @@ msgstr "ubah passphrase"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1338
+#: tools/gpgconf-comp.c:1641
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
@@ -824,77 +856,82 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:366
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr "armor: %s\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr "header armor tidak valid: "
 
-#: g10/armor.c:416
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr "header armor: "
 
-#: g10/armor.c:427
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr "header clearsig tidak valid\n"
 
-#: g10/armor.c:479
+#: g10/armor.c:455
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "header armor: "
+
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr "signature teks bersarang\n"
 
-#: g10/armor.c:614
+#: g10/armor.c:643
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armor tidak terduga:"
 
-#: g10/armor.c:626
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr "dash escaped line tidak valid: "
 
-#: g10/armor.c:780 g10/armor.c:1390
+#: g10/armor.c:809 g10/armor.c:1419
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "karakter radix64 tidak valid %02x dilewati\n"
 
-#: g10/armor.c:823
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematur (tanpa CRC)\n"
 
-#: g10/armor.c:857
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematur (dalam CRC)\n"
 
-#: g10/armor.c:865
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr "CRC tidak tepat\n"
 
-#: g10/armor.c:869 g10/armor.c:1427
+#: g10/armor.c:898 g10/armor.c:1456
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "kesalahan CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:889
+#: g10/armor.c:918
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "eof prematur (dalam Trailer)\n"
 
-#: g10/armor.c:893
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr "kesalahan dalam garis trailer\n"
 
-#: g10/armor.c:1204
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/armor.c:1209
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armor tidak valid: baris melebihi %d karakter\n"
 
-#: g10/armor.c:1213
+#: g10/armor.c:1242
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1240,11 +1277,11 @@ msgstr "menulis kunci rahasia ke `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/decrypt.c:110 g10/encode.c:890
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
@@ -1255,7 +1292,7 @@ msgstr "tidak dapat membuka `%s'\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1298,7 +1335,7 @@ msgstr "terdapat kunci rahasia untuk kunci publik \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
 
-#: g10/encode.c:226 g10/sign.c:1296
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
@@ -1317,7 +1354,7 @@ msgstr "menggunakan cipher %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "PERINGATAN: `%s' adalah file kosong\n"
@@ -1345,24 +1382,24 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:669 g10/sign.c:966
+#: g10/encode.c:655 g10/sign.c:936
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "memaksa algoritma kompresi %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:765
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/encode.c:862
+#: g10/encode.c:848
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s dienkripsi untuk: %s\n"
@@ -1550,7 +1587,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:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1558,133 +1595,133 @@ msgstr ""
 "@Perintah:\n"
 " "
 
-#: g10/gpg.c:370
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/gpg.c:372 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/gpg.c:375 sm/gpgsm.c:248
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/gpg.c:377 sm/gpgsm.c:249
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/gpg.c:381 sm/gpgsm.c:252
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/gpg.c:386 sm/gpgsm.c:254
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "remove keys from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "remove keys from the secret keyring"
 msgstr "hapus kunci dari keyring pribadi"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/gpg.c:397 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:402
 msgid "search for keys on a key server"
 msgstr "cari kunci di key server"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "update all keys from a keyserver"
 msgstr "update semua kunci dari keyserver"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:410
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/gpg.c:430 sm/gpgsm.c:264
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1694,47 +1731,48 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/gpg.c:434 sm/gpgsm.c:281
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/gpg.c:436 sm/gpgsm.c:293
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/gpg.c:447 sm/gpgsm.c:331
+#: g10/gpg.c:449 sm/gpgsm.c:333
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/gpg.c:448 sm/gpgsm.c:334
+#: g10/gpg.c:450 sm/gpgsm.c:336
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:336
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
-msgid "use as output file"
-msgstr "gunakan sebagai file output"
+#: g10/gpg.c:469 sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|muat modul ekstensi FILE"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "tanya sebelum menimpa"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:524
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:397
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1742,7 +1780,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:400
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1762,15 +1800,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/gpg.c:750 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Laporkan bug ke <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:767
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1780,7 +1818,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:578
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1788,566 +1826,570 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/gpg.c:784
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:798
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:805 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Kompresi: "
 
-#: g10/gpg.c:875
+#: g10/gpg.c:817 sm/gpgsm.c:603
+msgid "Used libraries:"
+msgstr ""
+
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:715
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/gpg.c:1063
+#: g10/gpg.c:1113
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
 
-#: g10/gpg.c:1260
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1263
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1266
+#: g10/gpg.c:1316
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1272
+#: g10/gpg.c:1322
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1325
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1328
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1284
+#: g10/gpg.c:1334
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1337
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1340
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1296
+#: g10/gpg.c:1346
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1349
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1352
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1445
+#: g10/gpg.c:1495
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1594
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1602
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1610
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1612
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1825
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1981
+#: g10/gpg.c:2030
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
-#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2493
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/gpg.c:2528
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2610
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2613
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2620
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2551
+#: g10/gpg.c:2623
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2630
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2561
+#: g10/gpg.c:2633
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2645
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2653
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2655
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2659
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2670
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2673
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2855
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1298
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2975
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat membuat signature detached atau clear saat dalam mode --"
 "pgp2\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "anda tidak dapat menandai dan mengenkripsi pada saat bersamaan dalam mode --"
 "pgp2\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "anda harus menggunakan file (dan bukan pipe) saat bekerja dengan opsi --"
 "pgpg2\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:3014
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1370
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1378
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3092
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3098
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3117
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth harus di antara 1 hingga 255\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3119
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "level cert default tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3121
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "level cert min tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3135
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3144
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3148
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3152
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3185
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3232
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3237
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma digest \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3242
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma kompresi \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public "
 "key \n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3375
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3403
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3449
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3454
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3474
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3630
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3641
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3651
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4233
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4235
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4268
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@ -2360,7 +2402,7 @@ msgstr "mengambil kunci ini dari keyring"
 msgid "make timestamp conflicts only a warning"
 msgstr "buat timestamp konflik hanya sebagai peringatan"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:372
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
@@ -2898,13 +2940,13 @@ msgstr "kunci %08lX: kunci baru - dilewati\n"
 msgid "no writable keyring found: %s\n"
 msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2369 g10/import.c:2391
+#: g10/import.c:2381 g10/import.c:2403
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
@@ -2994,7 +3036,7 @@ msgstr "kunci %08lX: kunci rahasia dengan cipher tidak valid %d - dilewati\n"
 msgid "importing secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/import.c:1158 g10/import.c:2384
+#: g10/import.c:1158 g10/import.c:2396
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "tidak ada keyring rahasia baku: %s\n"
@@ -3116,44 +3158,44 @@ msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "kunci %08lX: klas signature tidak diharapkan (0x%02x) - dilewati\n"
 
-#: g10/import.c:1732
+#: g10/import.c:1744
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:1794
+#: g10/import.c:1806
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "Peringatan: kunci %08lX dapat dibatalkan: mengambil kunci pembatalan %08lX\n"
 
-#: g10/import.c:1808
+#: g10/import.c:1820
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "Peringatan: kunci %08lX dapat dibatalkan: kunci pembatalan %08lX tidak ada\n"
 
-#: g10/import.c:1867
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:1901
+#: g10/import.c:1913
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2302
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "kunci publik tidak cocok dengan kunci rahasia!\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2310
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2312
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
@@ -3482,7 +3524,7 @@ msgid "Really sign? (y/N) "
 msgstr "Ditandai? "
 
 #: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:348
+#: g10/keyedit.c:5019 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
@@ -3845,8 +3887,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Anda ingin membatalkan kunci ini? "
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
 #: g10/keyedit.c:2140
@@ -4731,14 +4772,14 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:273
+#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:275
+#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5337,17 +5378,17 @@ msgstr "Tidak dikompresi"
 msgid "uncompressed|none"
 msgstr "Tidak dikompresi"
 
-#: g10/misc.c:874
+#: g10/misc.c:891
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "pesan ini mungkin tidak dapat digunakan oleh %s\n"
 
-#: g10/misc.c:1049
+#: g10/misc.c:1066
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/misc.c:1074
+#: g10/misc.c:1091
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
@@ -5404,12 +5445,12 @@ msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:603
+#: g10/passphrase.c:295 g10/passphrase.c:581
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID kunci utama %08lX)"
 
-#: g10/passphrase.c:327
+#: g10/passphrase.c:309
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5420,24 +5461,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, tercipta %s%s\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:334
 msgid "Repeat passphrase\n"
 msgstr "Ulangi passphrase\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:336
 msgid "Enter passphrase\n"
 msgstr "Masukkan passphrase\n"
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:363
 msgid "cancelled by user\n"
 msgstr "dibatalkan oleh user\n"
 
-#: g10/passphrase.c:384 g10/passphrase.c:450
+#: g10/passphrase.c:369 g10/passphrase.c:428
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
-#: g10/passphrase.c:582
+#: g10/passphrase.c:560
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5447,12 +5488,12 @@ msgstr ""
 "Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
 "pemakai: \""
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:568
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
 
-#: g10/passphrase.c:599
+#: g10/passphrase.c:577
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6089,32 +6130,14 @@ msgstr "kunci %08lX: tidak ada subkey untuk pembatalan paket\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding signature\n"
 
-#: g10/sign.c:82
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "tidak dapat menaruh notasi data ke signature v3(gaya PGP 2.x)\n"
-
-#: g10/sign.c:90
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "tidak dapat menaruh notasi data ke kunci signature v3 (gaya PGP 2.x)\n"
-
-#: g10/sign.c:104
+#: g10/sign.c:89
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "PERINGATAN: tidak dapat melakukan %%-expand notasi (terlalu besar).  "
 "Menggunakan yang tidak di-expand.\n"
 
-#: g10/sign.c:121
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"tidak dapat menaruh sebuah kebijakan URL ke signature v3 (gaya PGP 2.x)\n"
-
-#: g10/sign.c:129
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-"tidak dapat menaruh sebuah kebijakan URL ke signature v3 (gaya PGP 2.x)\n"
-
-#: g10/sign.c:142
+#: g10/sign.c:115
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6122,7 +6145,7 @@ msgstr ""
 "PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar).  "
 "Menggunakan yang tidak expand.\n"
 
-#: g10/sign.c:170
+#: g10/sign.c:138
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6131,39 +6154,39 @@ msgstr ""
 "PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar).  "
 "Menggunakan yang tidak expand.\n"
 
-#: g10/sign.c:343
+#: g10/sign.c:311
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: g10/sign.c:352
+#: g10/sign.c:320
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signature dari: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat detach-sign dengan kunci bergaya PGP 2.x saat dalam mode --"
 "pgp2\n"
 
-#: g10/sign.c:864
+#: g10/sign.c:834
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
 
-#: g10/sign.c:991
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "menandai:"
 
-#: g10/sign.c:1106
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat clearsign dengan kunci bergaya PGP 2.x saat dalam mode --"
 "pgp2\n"
 
-#: g10/sign.c:1290
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s enkripsi akan digunakan\n"
@@ -6875,64 +6898,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:114 sm/gpgsm.c:361
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 #, fuzzy
 msgid "read options from file"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "jangan menggunakan terminal"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:135
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "perintah saling konflik\n"
 
-#: scd/scdaemon.c:209
+#: scd/scdaemon.c:210
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: scd/scdaemon.c:211
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:658
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1006
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1011
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6966,11 +6989,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1631
+#: sm/certchain.c:195 sm/certchain.c:1646
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1631
+#: sm/certchain.c:196 sm/certchain.c:1646
 #, fuzzy
 msgid "shell"
 msgstr "bantuan"
@@ -7011,8 +7034,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
@@ -7180,7 +7203,7 @@ msgstr ""
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1730
+#: sm/certchain.c:1462 sm/certchain.c:1745
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "preferensi %c%lu ganda \n"
@@ -7195,11 +7218,11 @@ msgstr "Sertifikat pembatalan tercipta.\n"
 msgid "root certificate is good\n"
 msgstr "sertifikat yang buruk"
 
-#: sm/certchain.c:1620
+#: sm/certchain.c:1635
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1629
+#: sm/certchain.c:1644
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7214,7 +7237,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7228,25 +7251,25 @@ msgstr "n|t|tidak"
 msgid "[none]"
 msgstr "tidak dikenal"
 
-#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
+#: sm/certdump.c:583 sm/certdump.c:628 sm/certdump.c:693 sm/certdump.c:746
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: sm/certdump.c:558 sm/certdump.c:603
+#: sm/certdump.c:591 sm/certdump.c:636
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:640 sm/certdump.c:696
+#: sm/certdump.c:673 sm/certdump.c:729
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:665 sm/certdump.c:719
+#: sm/certdump.c:698 sm/certdump.c:752
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: sm/certdump.c:936
+#: sm/certdump.c:946
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7373,181 +7396,190 @@ msgstr "gagal menghapus keyblok: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(Tidak diberikan deskripsi)\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list external keys"
 msgstr "tampilkan kunci rahasia"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
 #, fuzzy
 msgid "list certificate chain"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "import certificates"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "export certificates"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:270
 #, fuzzy
 msgid "change a passphrase"
 msgstr "ubah passphrase"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "ciptakan output ascii"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "use the default key as default recipient"
 msgstr "gunakan kunci baku sebagai penerima baku"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr "jangan menggunakan terminal"
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:345
+msgid "|FILE|write a server mode log to FILE"
+msgstr ""
+
+#: sm/gpgsm.c:347
+#, fuzzy
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FILE|muat modul ekstensi FILE"
+
+#: sm/gpgsm.c:349
 msgid "force v3 signatures"
 msgstr "paksa signature v3"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr "selalu gunakan MDC untuk enkripsi"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:359
 msgid "add this keyring to the list of keyrings"
 msgstr "tambah keyring ini ke daftar keyring"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:360
 msgid "add this secret keyring to the list"
 msgstr "tambah keyring rahasia ini ke daftar"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:363
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMA|set charset terminal ke NAMA"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:379
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:388
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:390
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:392
 msgid "|N|use compress algorithm N"
 msgstr "|N|gunakan algoritma kompresi N"
 
-#: sm/gpgsm.c:568
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: sm/gpgsm.c:571
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7558,36 +7590,36 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: sm/gpgsm.c:650
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: sm/gpgsm.c:748
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: sm/gpgsm.c:759
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: sm/gpgsm.c:1315
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1411
+#: sm/gpgsm.c:1468
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: sm/gpgsm.c:1429
+#: sm/gpgsm.c:1486
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: sm/gpgsm.c:1612
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7610,7 +7642,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:1274
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -7673,17 +7705,17 @@ msgstr "kesalahan membaca `%s': %s\n"
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:111
+#: sm/qualified.c:105
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: sm/qualified.c:129
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:225
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7694,13 +7726,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234 sm/verify.c:536
+#: sm/qualified.c:209 sm/verify.c:580
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:327
+#: sm/qualified.c:277
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7713,293 +7745,311 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:424
 #, fuzzy
 msgid "Signature made "
 msgstr "Signature kadaluwarsa %s\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:428
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:429
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/verify.c:514
+#: sm/verify.c:558
 #, fuzzy
 msgid "Good signature from"
 msgstr "Signature baik dari \""
 
-#: sm/verify.c:515
+#: sm/verify.c:559
 #, fuzzy
 msgid "                aka"
 msgstr "              alias \""
 
-#: sm/verify.c:533
+#: sm/verify.c:577
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr ""
 "\n"
 "Ini akan jadi self-signature.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "q|k|keluar"
 
-#: tools/gpg-connect-agent.c:60
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:127
+#: tools/gpg-connect-agent.c:74
+#, fuzzy
+msgid "|FILE|run commands from FILE on startup"
+msgstr "|FILE|muat modul ekstensi FILE"
+
+#: tools/gpg-connect-agent.c:75
+msgid "run /subst on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:174
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: tools/gpg-connect-agent.c:130
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:314
+#: tools/gpg-connect-agent.c:1155
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:323
+#: tools/gpg-connect-agent.c:1164
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:381
+#: tools/gpg-connect-agent.c:1219 tools/gpg-connect-agent.c:1645
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "gagal menghapus keyblok: %s\n"
+
+#: tools/gpg-connect-agent.c:1299
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "baris terlalu panjang\n"
 
-#: tools/gpg-connect-agent.c:385
+#: tools/gpg-connect-agent.c:1303
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:1619
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:1637
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: tools/gpg-connect-agent.c:473
-#, fuzzy, c-format
-msgid "receiving line failed: %s\n"
-msgstr "gagal menghapus keyblok: %s\n"
-
-#: tools/gpg-connect-agent.c:789
+#: tools/gpg-connect-agent.c:1986
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:798
+#: tools/gpg-connect-agent.c:1995
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
-#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
+#: tools/gpgconf-comp.c:459 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:773
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:796
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
-#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
+#: tools/gpgconf-comp.c:482 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:803
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
-#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:487 tools/gpgconf-comp.c:606 tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:729 tools/gpgconf-comp.c:811
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:737
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:504
+#: tools/gpgconf-comp.c:502
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:506
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:512
+#: tools/gpgconf-comp.c:510
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:526
+#: tools/gpgconf-comp.c:524
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:527
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:531
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:535
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:539
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:543
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|gunakan passphrase mode N"
 
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:547
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:710
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:669
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:674
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:719
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
 
-#: tools/gpgconf-comp.c:744
+#: tools/gpgconf-comp.c:742
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:786
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:824
+#: tools/gpgconf-comp.c:822
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:834
+#: tools/gpgconf-comp.c:832
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:845
+#: tools/gpgconf-comp.c:843
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:850
+#: tools/gpgconf-comp.c:848
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:887
+#: tools/gpgconf-comp.c:885
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2982
+#: tools/gpgconf-comp.c:3006
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:59
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
+#, fuzzy
+msgid "list global configuration file"
+msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
+
+#: tools/gpgconf.c:67
 #, fuzzy
 msgid "check global configuration file"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:71
+msgid "use as output file"
+msgstr "gunakan sebagai file output"
+
+#: tools/gpgconf.c:75
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:100
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:176 tools/gpgconf.c:209
+#: tools/gpgconf.c:202 tools/gpgconf.c:240
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: tools/gpgconf.c:178
+#: tools/gpgconf.c:204
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:187
+#: tools/gpgconf.c:213
 #, fuzzy
 msgid "Component not found"
 msgstr "kunci publik tidak ditemukan"
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:242
 #, fuzzy
 msgid "No argument allowed"
 msgstr "menulis kunci rahasia ke `%s'\n"
@@ -8093,92 +8143,107 @@ msgstr "kesalahan membaca `%s': %s\n"
 msgid "error closing %s: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: tools/symcryptrun.c:515
+#: tools/symcryptrun.c:486
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "tidak ada eksekusi program remote yang didukung\n"
 
-#: tools/symcryptrun.c:521
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:556
+#: tools/symcryptrun.c:527
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: tools/symcryptrun.c:563
+#: tools/symcryptrun.c:534
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: tools/symcryptrun.c:579
+#: tools/symcryptrun.c:550
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:578
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: tools/symcryptrun.c:636
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: tools/symcryptrun.c:653
+#: tools/symcryptrun.c:624
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: tools/symcryptrun.c:705
+#: tools/symcryptrun.c:676
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: tools/symcryptrun.c:757
+#: tools/symcryptrun.c:728
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: tools/symcryptrun.c:771
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:826
+#: tools/symcryptrun.c:797
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: tools/symcryptrun.c:839
+#: tools/symcryptrun.c:810
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: tools/symcryptrun.c:1014
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1041
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1050
+#: tools/symcryptrun.c:1021
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "tidak dapat menaruh notasi data ke signature v3(gaya PGP 2.x)\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "tidak dapat menaruh notasi data ke kunci signature v3 (gaya PGP 2.x)\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "tidak dapat menaruh sebuah kebijakan URL ke signature v3 (gaya PGP 2.x)\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "tidak dapat menaruh sebuah kebijakan URL ke signature v3 (gaya PGP 2.x)\n"
+
 #, fuzzy
 #~ msgid "shelll"
 #~ msgstr "bantuan"
diff --git a/po/it.po b/po/it.po
index 9fe861ad8..0346c41b2 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-09-14 13:27+0200\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
 "PO-Revision-Date: 2004-06-16 17:01+0200\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -14,59 +14,75 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: agent/call-pinentry.c:438
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:441
+#: agent/call-pinentry.c:551
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: agent/call-pinentry.c:489
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+msgid "Quality:"
+msgstr ""
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 #, fuzzy
 msgid "PIN too long"
 msgstr "riga troppo lunga\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:668
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "passphrase troppo lunga\n"
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:676
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Carattere non valido nel nome\n"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:535
+#: agent/call-pinentry.c:693
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI danneggiato"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:694
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "passphrase errata"
 
-#: agent/call-pinentry.c:572
+#: agent/call-pinentry.c:730
 #, fuzzy
 msgid "Passphrase"
 msgstr "passphrase errata"
@@ -76,21 +92,21 @@ msgstr "passphrase errata"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
-#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1865
-#: sm/gpgsm.c:1902 sm/gpgsm.c:1940 sm/qualified.c:72
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
@@ -130,14 +146,25 @@ msgstr "errore scrivendo il portachiavi `%s': %s\n"
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: agent/command-ssh.c:2349
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "cambia la passphrase"
+
+#: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2850
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/command-ssh.c:2885
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: creazione della tabella hash fallita: %s\n"
@@ -182,76 +209,66 @@ msgstr "Inserisci la passphrase\n"
 msgid "Take this one anyway"
 msgstr "Uso lo stesso questa chiave? "
 
-#: agent/genkey.c:185
+#: agent/genkey.c:191
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u character long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u characters long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:202
+#: agent/genkey.c:212
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digit or special character."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digits or special characters."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:225
+#: agent/genkey.c:235
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
-"passphrase may not%0Abe a known term or match certain pattern."
+"Warning: You have entered an insecure passphrase.%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:238
+#: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:240
+#: agent/genkey.c:253
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:246
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:290
+#: agent/genkey.c:306
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "cambia la passphrase"
-
-#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
-#: tools/symcryptrun.c:456
-msgid "does not match - try again"
-msgstr ""
-
-#: agent/genkey.c:412
+#: agent/genkey.c:429
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "cambia la passphrase"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:104
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -261,66 +278,65 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:109
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:69 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "prolisso"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:341
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:112
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:113
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
-#: tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cerca delle chiavi su un key server"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:134
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aggiorna il database della fiducia"
@@ -358,150 +374,165 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:91 tools/symcryptrun.c:204
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Per favore segnala i bug a <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:512 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:340 sm/gpgsm.c:819 sm/gpgsm.c:822 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, 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:610 agent/gpg-agent.c:1177 g10/gpg.c:2027
-#: scd/scdaemon.c:421 sm/gpgsm.c:914 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: agent/gpg-agent.c:947 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "errore creando `%s': %s\n"
 
-#: agent/gpg-agent.c:1247 agent/gpg-agent.c:1373 agent/gpg-agent.c:1377
-#: agent/gpg-agent.c:1418 agent/gpg-agent.c:1422 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:908
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "impossibile creare la directory `%s': %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
+#: agent/gpg-agent.c:1321
+#, c-format
+msgid "socket name `%s' is too long\n"
+msgstr ""
+
+#: agent/gpg-agent.c:1333
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
+#, fuzzy
+msgid "error getting nonce for the socket\n"
+msgstr "errore nella creazione della passhprase: %s\n"
+
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directory creata\n"
 
-#: agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1448
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1438
+#: agent/gpg-agent.c:1452
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: impossibile creare la directory: %s\n"
 
-#: agent/gpg-agent.c:1549
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
+#, fuzzy, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "errore leggendo `%s': %s\n"
+
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1554
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1571
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1576
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: saltata: %s\n"
 
-#: agent/gpg-agent.c:1809
+#: agent/gpg-agent.c:1850
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:756
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 
-#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
-#: tools/gpg-connect-agent.c:767
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "la versione %d del protocollo di gpg-agent non � gestita\n"
@@ -528,40 +559,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1188
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1191
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: agent/protect-tool.c:1216
+#: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1221
+#: agent/protect-tool.c:1199
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "passphrase errata"
 
-#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancella"
@@ -673,7 +704,8 @@ msgstr "cambia la passphrase"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1338
+#: tools/gpgconf-comp.c:1641
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
@@ -822,77 +854,82 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:366
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr "armatura: %s\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr "header dell'armatura non valido: "
 
-#: g10/armor.c:416
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr "header dell'armatura: "
 
-#: g10/armor.c:427
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr "header della firma in chiaro non valido\n"
 
-#: g10/armor.c:479
+#: g10/armor.c:455
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "header dell'armatura: "
+
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr "firme in chiaro annidate\n"
 
-#: g10/armor.c:614
+#: g10/armor.c:643
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armatura inaspettata:"
 
-#: g10/armor.c:626
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr "riga protetta con il trattino non valida: "
 
-#: g10/armor.c:780 g10/armor.c:1390
+#: g10/armor.c:809 g10/armor.c:1419
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "Carattere radix64 non valido %02x saltato\n"
 
-#: g10/armor.c:823
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematura (nessun CRC)\n"
 
-#: g10/armor.c:857
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematura (nel CRC)\n"
 
-#: g10/armor.c:865
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr "CRC malformato\n"
 
-#: g10/armor.c:869 g10/armor.c:1427
+#: g10/armor.c:898 g10/armor.c:1456
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "errore nel CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:889
+#: g10/armor.c:918
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "eof prematura (nella coda)\n"
 
-#: g10/armor.c:893
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr "errore nella riga della coda\n"
 
-#: g10/armor.c:1204
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/armor.c:1209
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armatura non valida: linea pi� lunga di %d caratteri\n"
 
-#: g10/armor.c:1213
+#: g10/armor.c:1242
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1239,11 +1276,11 @@ msgstr "scrittura della chiave segreta in `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/decrypt.c:110 g10/encode.c:890
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
@@ -1254,7 +1291,7 @@ msgstr "impossibile aprire `%s'\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1297,7 +1334,7 @@ msgstr "c'� una chiave segreta per la chiave pubblica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "usa prima l'opzione \"--delete-secret-keys\" per cancellarla.\n"
 
-#: g10/encode.c:226 g10/sign.c:1296
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
@@ -1317,7 +1354,7 @@ msgstr "uso il cifrario %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' � gi� compresso\n"
 
-#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENZIONE: `%s' � un file vuoto\n"
@@ -1348,7 +1385,7 @@ msgstr ""
 "forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:669 g10/sign.c:966
+#: g10/encode.c:655 g10/sign.c:936
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1357,19 +1394,19 @@ msgstr ""
 "forzare l'algoritmo di compressione %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:765
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/encode.c:862
+#: g10/encode.c:848
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrato per: \"%s\"\n"
@@ -1559,7 +1596,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:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1567,133 +1604,133 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/gpg.c:370
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/gpg.c:372 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/gpg.c:375 sm/gpgsm.c:248
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/gpg.c:377 sm/gpgsm.c:249
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:381 sm/gpgsm.c:252
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/gpg.c:386 sm/gpgsm.c:254
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "remove keys from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "remove keys from the secret keyring"
 msgstr "rimuove le chiavi dal portachiavi privato"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "firma una chiave localmente"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/gpg.c:397 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:402
 msgid "search for keys on a key server"
 msgstr "cerca delle chiavi su un key server"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "update all keys from a keyserver"
 msgstr "aggiorna tutte le chiavi da un key server"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:410
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/gpg.c:430 sm/gpgsm.c:264
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1703,47 +1740,48 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:281
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/gpg.c:436 sm/gpgsm.c:293
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/gpg.c:447 sm/gpgsm.c:331
+#: g10/gpg.c:449 sm/gpgsm.c:333
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/gpg.c:448 sm/gpgsm.c:334
+#: g10/gpg.c:450 sm/gpgsm.c:336
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:336
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
-msgid "use as output file"
-msgstr "usa come file di output"
+#: g10/gpg.c:469 sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "chiede prima di sovrascrivere"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:524
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:397
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1751,7 +1789,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:400
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1771,15 +1809,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/gpg.c:750 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Per favore segnala i bug a <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:767
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1789,7 +1827,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:578
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1797,561 +1835,565 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/gpg.c:784
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Cifrari: "
 
-#: g10/gpg.c:798
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:805 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Compressione: "
 
-#: g10/gpg.c:875
+#: g10/gpg.c:817 sm/gpgsm.c:603
+msgid "Used libraries:"
+msgstr ""
+
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:715
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/gpg.c:1063
+#: g10/gpg.c:1113
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "non � stato trovato il segno = nella definizione del gruppo \"%s\"\n"
 
-#: g10/gpg.c:1260
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1263
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1266
+#: g10/gpg.c:1316
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1272
+#: g10/gpg.c:1322
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1325
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1328
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1284
+#: g10/gpg.c:1334
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1337
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1340
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1296
+#: g10/gpg.c:1346
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1349
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1352
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1445
+#: g10/gpg.c:1495
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1594
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1602
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1610
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1612
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1825
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1981
+#: g10/gpg.c:2030
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 "NOTA: il vecchio file `%s' con le opzioni predefinite � stato ignorato\n"
 
-#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2493
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/gpg.c:2528
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2610
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2613
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2620
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2551
+#: g10/gpg.c:2623
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2630
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2561
+#: g10/gpg.c:2633
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2645
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2653
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2655
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2659
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2670
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2673
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2855
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1298
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2975
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 puoi fare solo firme in chiaro o separate\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 non puoi firmare e cifrare contemporaneamente\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "devi usare dei file (e non una pipe) quando lavori con --pgp2 attivo.\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:3014
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1370
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1378
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3092
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3098
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3117
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve essere tra 1 e 255\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3119
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level non valido; deve essere 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3121
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level non valido; deve essere 1, 2 o 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3135
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3144
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3148
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3152
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3185
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3232
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "non � possibile usare l'algoritmo di cifratura \"%s\" in modalit� %s\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3237
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "non � possibile usare l'algoritmo di digest \"%s\" in modalit� %s\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3242
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "non � possibile usare l'algoritmo di compressione \"%s\" in modalit� %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ATTENZIONE: sono stati indicati dei destinatari (-r) senza usare la\n"
 "crittografia a chiave pubblica\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3375
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3403
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3449
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3454
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3474
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3630
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3641
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3651
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4233
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non � valido\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4235
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4268
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
@@ -2364,7 +2406,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:75 sm/gpgsm.c:372
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato sul FD"
 
@@ -2903,13 +2945,13 @@ msgstr "chiave %08lX: nuova chiave - saltata\n"
 msgid "no writable keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2369 g10/import.c:2391
+#: g10/import.c:2381 g10/import.c:2403
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
@@ -2999,7 +3041,7 @@ msgstr "chiave %08lX: chiave segreta con cifrario %d non valido - saltata\n"
 msgid "importing secret keys not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/import.c:1158 g10/import.c:2384
+#: g10/import.c:1158 g10/import.c:2396
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nessun portachiavi segreto predefinito: %s\n"
@@ -3122,46 +3164,46 @@ msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chiave %08lX: classe della firma inaspettata (0x%02x) - saltata\n"
 
-#: g10/import.c:1732
+#: g10/import.c:1744
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
 
-#: g10/import.c:1794
+#: g10/import.c:1806
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "ATTENZIONE: la chiave %08lX pu� essere stata revocata: scarico la chiave\n"
 "di revoca %08lX.\n"
 
-#: g10/import.c:1808
+#: g10/import.c:1820
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "ATTENZIONE: la chiave %08lX pu� essere stata revocata: la chiave di\n"
 "revoca %08lX non � presente.\n"
 
-#: g10/import.c:1867
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n"
 
-#: g10/import.c:1901
+#: g10/import.c:1913
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2302
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2310
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2312
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
@@ -3488,7 +3530,7 @@ msgid "Really sign? (y/N) "
 msgstr "Firmo davvero? "
 
 #: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:348
+#: g10/keyedit.c:5019 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
@@ -3851,8 +3893,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vuoi davvero revocare questa chiave? "
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
 #: g10/keyedit.c:2140
@@ -4746,7 +4787,7 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:273
+#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4754,7 +4795,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:275
+#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5357,17 +5398,17 @@ msgstr "Non compresso"
 msgid "uncompressed|none"
 msgstr "Non compresso"
 
-#: g10/misc.c:874
+#: g10/misc.c:891
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "questo messaggio pu� non essere utilizzabile da %s\n"
 
-#: g10/misc.c:1049
+#: g10/misc.c:1066
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/misc.c:1074
+#: g10/misc.c:1091
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
@@ -5428,12 +5469,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:603
+#: g10/passphrase.c:295 g10/passphrase.c:581
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (key ID principale %08lX)"
 
-#: g10/passphrase.c:327
+#: g10/passphrase.c:309
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5444,24 +5485,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, created %s%s\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:334
 msgid "Repeat passphrase\n"
 msgstr "Ripeti la passphrase\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:336
 msgid "Enter passphrase\n"
 msgstr "Inserisci la passphrase\n"
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:363
 msgid "cancelled by user\n"
 msgstr "interrotto dall'utente\n"
 
-#: g10/passphrase.c:384 g10/passphrase.c:450
+#: g10/passphrase.c:369 g10/passphrase.c:428
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
 
-#: g10/passphrase.c:582
+#: g10/passphrase.c:560
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5471,12 +5512,12 @@ msgstr ""
 "Ti serve una passphrase per sbloccare la chiave segreta\n"
 "dell'utente: \""
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:568
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
 
-#: g10/passphrase.c:599
+#: g10/passphrase.c:577
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6130,34 +6171,14 @@ msgstr ""
 "chiave %08lX: non c'� una subchiave per la firma di collegamento della "
 "subchiave\n"
 
-#: g10/sign.c:82
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "impossibile inserire notation data nelle firme v3 (stile PGP 2.x)\n"
-
-#: g10/sign.c:90
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-"impossibile inserire notation data nelle firme di chiavi v3 (stile PGP 2.x)\n"
-
-#: g10/sign.c:104
+#: g10/sign.c:89
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "ATTENZIONE: impossibile espandere i %% nell'URL (troppo lunga). Usata "
 "inespansa.\n"
 
-#: g10/sign.c:121
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"impossibile inserire l'URL di una policy nelle firme v3 (stile PGP 2.x)\n"
-
-#: g10/sign.c:129
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-"impossibile inserire l'URL di una policy nelle firme di chiavi v3 (stile\n"
-"PGP 2.x)\n"
-
-#: g10/sign.c:142
+#: g10/sign.c:115
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6166,7 +6187,7 @@ msgstr ""
 "lunga).\n"
 "Usata inespansa.\n"
 
-#: g10/sign.c:170
+#: g10/sign.c:138
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6176,39 +6197,39 @@ msgstr ""
 "lunga).\n"
 "Usata inespansa.\n"
 
-#: g10/sign.c:343
+#: g10/sign.c:311
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: g10/sign.c:352
+#: g10/sign.c:320
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "Firma %s da: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "nella modalit� --pgp2 puoi fare firme separate solo con chiavi in stile PGP "
 "2.x\n"
 
-#: g10/sign.c:864
+#: g10/sign.c:834
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
 
-#: g10/sign.c:991
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:1106
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "In modalit� -pgp2 puoi firmare in chiaro solo con chiavi in stile PGP 2.x\n"
 
-#: g10/sign.c:1290
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "sar� usato il cifrario %s\n"
@@ -6921,64 +6942,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:114 sm/gpgsm.c:361
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 #, fuzzy
 msgid "read options from file"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "non usa per niente il terminale"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:135
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "comandi in conflitto\n"
 
-#: scd/scdaemon.c:209
+#: scd/scdaemon.c:210
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: scd/scdaemon.c:211
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:658
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1006
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1011
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7012,11 +7033,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1631
+#: sm/certchain.c:195 sm/certchain.c:1646
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1631
+#: sm/certchain.c:196 sm/certchain.c:1646
 #, fuzzy
 msgid "shell"
 msgstr "help"
@@ -7057,8 +7078,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
@@ -7226,7 +7247,7 @@ msgstr ""
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1730
+#: sm/certchain.c:1462 sm/certchain.c:1745
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "la preferenza %c%lu � doppia\n"
@@ -7241,11 +7262,11 @@ msgstr "Certificato di revoca creato.\n"
 msgid "root certificate is good\n"
 msgstr "certificato danneggiato"
 
-#: sm/certchain.c:1620
+#: sm/certchain.c:1635
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1629
+#: sm/certchain.c:1644
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7260,7 +7281,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7274,25 +7295,25 @@ msgstr "no"
 msgid "[none]"
 msgstr "sconosciuto"
 
-#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
+#: sm/certdump.c:583 sm/certdump.c:628 sm/certdump.c:693 sm/certdump.c:746
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "errore: impronta digitale non valida\n"
 
-#: sm/certdump.c:558 sm/certdump.c:603
+#: sm/certdump.c:591 sm/certdump.c:636
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:640 sm/certdump.c:696
+#: sm/certdump.c:673 sm/certdump.c:729
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:665 sm/certdump.c:719
+#: sm/certdump.c:698 sm/certdump.c:752
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "errore: impronta digitale non valida\n"
 
-#: sm/certdump.c:936
+#: sm/certdump.c:946
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7419,181 +7440,190 @@ msgstr "cancellazione del keyblock fallita: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(Non � stata data una descrizione)\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
 #, 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:255
 #, fuzzy
 msgid "list external keys"
 msgstr "elenca le chiavi segrete"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
 #, fuzzy
 msgid "list certificate chain"
 msgstr "certificato danneggiato"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "import certificates"
 msgstr "certificato danneggiato"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "export certificates"
 msgstr "certificato danneggiato"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:270
 #, fuzzy
 msgid "change a passphrase"
 msgstr "cambia la passphrase"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crea un output ascii con armatura"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "use the default key as default recipient"
 msgstr "usa la chiave predefinita come destinatario predefinito"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:345
+msgid "|FILE|write a server mode log to FILE"
+msgstr ""
+
+#: sm/gpgsm.c:347
+#, fuzzy
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FILE|carica il modulo di estensione FILE"
+
+#: sm/gpgsm.c:349
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr "usa sempre un MDC per cifrare"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr "risponde \"s�\" a quasi tutte le domande"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr "risponde \"no\" a quasi tutte le domande"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:359
 msgid "add this keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:360
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME come chiave segreta predefinita"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:363
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOME|imposta NOME come set di caratteri del terminale"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:379
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:388
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di cifratura NOME"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:390
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di message digest NOME"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:392
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: sm/gpgsm.c:568
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: sm/gpgsm.c:571
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7604,36 +7634,36 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: sm/gpgsm.c:650
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: sm/gpgsm.c:748
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "impossibile connettersi a `%s': %s\n"
 
-#: sm/gpgsm.c:759
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: sm/gpgsm.c:1315
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1411
+#: sm/gpgsm.c:1468
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: sm/gpgsm.c:1429
+#: sm/gpgsm.c:1486
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "impossibile chiudere `%s': %s\n"
 
-#: sm/gpgsm.c:1612
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7656,7 +7686,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:1274
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "errore leggendo `%s': %s\n"
@@ -7719,17 +7749,17 @@ msgstr "errore leggendo `%s': %s\n"
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:111
+#: sm/qualified.c:105
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "errore: impronta digitale non valida\n"
 
-#: sm/qualified.c:129
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:225
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7740,13 +7770,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234 sm/verify.c:536
+#: sm/qualified.c:209 sm/verify.c:580
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:327
+#: sm/qualified.c:277
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7759,293 +7789,311 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:424
 #, fuzzy
 msgid "Signature made "
 msgstr "Firma scaduta il %s\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:428
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:429
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: sm/verify.c:514
+#: sm/verify.c:558
 #, fuzzy
 msgid "Good signature from"
 msgstr "Firma valida da \""
 
-#: sm/verify.c:515
+#: sm/verify.c:559
 #, fuzzy
 msgid "                aka"
 msgstr "                alias \""
 
-#: sm/verify.c:533
+#: sm/verify.c:577
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr ""
 "\n"
 "Questa sar� una autofirma.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "quit"
 
-#: tools/gpg-connect-agent.c:60
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:127
+#: tools/gpg-connect-agent.c:74
+#, fuzzy
+msgid "|FILE|run commands from FILE on startup"
+msgstr "|FILE|carica il modulo di estensione FILE"
+
+#: tools/gpg-connect-agent.c:75
+msgid "run /subst on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:174
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: tools/gpg-connect-agent.c:130
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:314
+#: tools/gpg-connect-agent.c:1155
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:323
+#: tools/gpg-connect-agent.c:1164
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:381
+#: tools/gpg-connect-agent.c:1219 tools/gpg-connect-agent.c:1645
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "cancellazione del keyblock fallita: %s\n"
+
+#: tools/gpg-connect-agent.c:1299
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "riga troppo lunga\n"
 
-#: tools/gpg-connect-agent.c:385
+#: tools/gpg-connect-agent.c:1303
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:1619
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:1637
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: tools/gpg-connect-agent.c:473
-#, fuzzy, c-format
-msgid "receiving line failed: %s\n"
-msgstr "cancellazione del keyblock fallita: %s\n"
-
-#: tools/gpg-connect-agent.c:789
+#: tools/gpg-connect-agent.c:1986
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:798
+#: tools/gpg-connect-agent.c:1995
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
-#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
+#: tools/gpgconf-comp.c:459 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:773
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:796
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
-#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
+#: tools/gpgconf-comp.c:482 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:803
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
-#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:487 tools/gpgconf-comp.c:606 tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:729 tools/gpgconf-comp.c:811
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:737
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:504
+#: tools/gpgconf-comp.c:502
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:506
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:512
+#: tools/gpgconf-comp.c:510
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:526
+#: tools/gpgconf-comp.c:524
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:527
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:531
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:535
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:539
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:543
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|usa il modo N per la passphrase"
 
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:547
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:710
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOME|cifra per NOME"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:669
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:674
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:719
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
 
-#: tools/gpgconf-comp.c:744
+#: tools/gpgconf-comp.c:742
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:786
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:824
+#: tools/gpgconf-comp.c:822
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:834
+#: tools/gpgconf-comp.c:832
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:845
+#: tools/gpgconf-comp.c:843
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:850
+#: tools/gpgconf-comp.c:848
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:887
+#: tools/gpgconf-comp.c:885
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2982
+#: tools/gpgconf-comp.c:3006
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:59
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
+#, fuzzy
+msgid "list global configuration file"
+msgstr "elemento della configurazione sconosciuto \"%s\"\n"
+
+#: tools/gpgconf.c:67
 #, fuzzy
 msgid "check global configuration file"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:71
+msgid "use as output file"
+msgstr "usa come file di output"
+
+#: tools/gpgconf.c:75
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:100
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:176 tools/gpgconf.c:209
+#: tools/gpgconf.c:202 tools/gpgconf.c:240
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: tools/gpgconf.c:178
+#: tools/gpgconf.c:204
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:187
+#: tools/gpgconf.c:213
 #, fuzzy
 msgid "Component not found"
 msgstr "chiave pubblica non trovata"
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:242
 #, fuzzy
 msgid "No argument allowed"
 msgstr "scrittura della chiave segreta in `%s'\n"
@@ -8139,92 +8187,109 @@ msgstr "errore leggendo `%s': %s\n"
 msgid "error closing %s: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: tools/symcryptrun.c:515
+#: tools/symcryptrun.c:486
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "l'esecuzione remota dei programmi non � gestita\n"
 
-#: tools/symcryptrun.c:521
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:556
+#: tools/symcryptrun.c:527
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: tools/symcryptrun.c:563
+#: tools/symcryptrun.c:534
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: tools/symcryptrun.c:579
+#: tools/symcryptrun.c:550
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:578
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: tools/symcryptrun.c:636
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: tools/symcryptrun.c:653
+#: tools/symcryptrun.c:624
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: tools/symcryptrun.c:705
+#: tools/symcryptrun.c:676
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: tools/symcryptrun.c:757
+#: tools/symcryptrun.c:728
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: tools/symcryptrun.c:771
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:826
+#: tools/symcryptrun.c:797
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: tools/symcryptrun.c:839
+#: tools/symcryptrun.c:810
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: tools/symcryptrun.c:1014
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1041
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1050
+#: tools/symcryptrun.c:1021
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "impossibile inserire notation data nelle firme v3 (stile PGP 2.x)\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "impossibile inserire notation data nelle firme di chiavi v3 (stile PGP 2."
+#~ "x)\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "impossibile inserire l'URL di una policy nelle firme v3 (stile PGP 2.x)\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "impossibile inserire l'URL di una policy nelle firme di chiavi v3 (stile\n"
+#~ "PGP 2.x)\n"
+
 #, fuzzy
 #~ msgid "shelll"
 #~ msgstr "help"
diff --git a/po/ja.po b/po/ja.po
index 0efd97335..93b21a230 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.3.92\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-09-14 13:27+0200\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
 "PO-Revision-Date: 2004-11-23 11:14+0900\n"
 "Last-Translator: IIDA Yosiaki <iida@gnu.org>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -17,59 +17,76 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: agent/call-pinentry.c:438
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:441
+#: agent/call-pinentry.c:551
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/call-pinentry.c:489
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+#, fuzzy
+msgid "Quality:"
+msgstr "ͭ����: %s"
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 #, fuzzy
 msgid "PIN too long"
 msgstr "�Ԥ�Ĺ�����ޤ�"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:668
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "�ѥ��ե졼����Ĺ�����ޤ�\n"
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:676
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:535
+#: agent/call-pinentry.c:693
 #, fuzzy
 msgid "Bad PIN"
 msgstr "������MPI�Ǥ�"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:694
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "�ѥ��ե졼���������Ǥ�"
 
-#: agent/call-pinentry.c:572
+#: agent/call-pinentry.c:730
 #, fuzzy
 msgid "Passphrase"
 msgstr "�ѥ��ե졼���������Ǥ�"
@@ -79,21 +96,21 @@ msgstr "�ѥ��ե졼���������Ǥ�"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
-#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1865
-#: sm/gpgsm.c:1902 sm/gpgsm.c:1940 sm/qualified.c:72
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
@@ -133,14 +150,25 @@ msgstr "���ء�%s�פν���ߥ��顼: %s\n"
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/command-ssh.c:2349
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "�ѥ��ե졼�����ѹ�"
+
+#: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2850
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/command-ssh.c:2885
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: �ϥå���ɽ�κ����˼��Ԥ��ޤ���: %s\n"
@@ -185,76 +213,66 @@ msgstr "�ѥ��ե졼��������\n"
 msgid "Take this one anyway"
 msgstr "����Ǥ⤳�θ���Ȥ��ޤ���? (y/N) "
 
-#: agent/genkey.c:185
+#: agent/genkey.c:191
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u character long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u characters long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:202
+#: agent/genkey.c:212
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digit or special character."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digits or special characters."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:225
+#: agent/genkey.c:235
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
-"passphrase may not%0Abe a known term or match certain pattern."
+"Warning: You have entered an insecure passphrase.%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:238
+#: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:240
+#: agent/genkey.c:253
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:246
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:290
+#: agent/genkey.c:306
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "�ѥ��ե졼�����ѹ�"
-
-#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
-#: tools/symcryptrun.c:456
-msgid "does not match - try again"
-msgstr ""
-
-#: agent/genkey.c:412
+#: agent/genkey.c:429
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:104
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -264,66 +282,65 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:109
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:69 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:341
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "����Ť�"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:112
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:113
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
-#: tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "�������С��θ��򸡺�����"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:134
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "���ѥǡ����١����򹹿�"
@@ -361,150 +378,165 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:91 tools/symcryptrun.c:204
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "�Х��򸫤Ĥ����� <gnupg-bugs@gnu.org> �ޤǤ���𤯤�������\n"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:512 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:340 sm/gpgsm.c:819 sm/gpgsm.c:822 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: agent/gpg-agent.c:610 agent/gpg-agent.c:1177 g10/gpg.c:2027
-#: scd/scdaemon.c:421 sm/gpgsm.c:914 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: agent/gpg-agent.c:947 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "��%s�פκ������顼: %s\n"
 
-#: agent/gpg-agent.c:1247 agent/gpg-agent.c:1373 agent/gpg-agent.c:1377
-#: agent/gpg-agent.c:1418 agent/gpg-agent.c:1422 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:908
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
+#: agent/gpg-agent.c:1321
+#, c-format
+msgid "socket name `%s' is too long\n"
+msgstr ""
+
+#: agent/gpg-agent.c:1333
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
+#, fuzzy
+msgid "error getting nonce for the socket\n"
+msgstr "������PIN�μ������顼: %s\n"
+
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "��%s�פǿ��ѥ쥳���ɤθ������顼: %s\n"
 
-#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ��Ǥ��ޤ���\n"
 
-#: agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1448
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d)��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1438
+#: agent/gpg-agent.c:1452
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1549
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
+#, fuzzy, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "��%s�פ��ɽФ����顼: %s\n"
+
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1554
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1571
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1576
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: �����å�: %s\n"
 
-#: agent/gpg-agent.c:1809
+#: agent/gpg-agent.c:1850
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:756
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
 
-#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
-#: tools/gpg-connect-agent.c:767
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
@@ -531,40 +563,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1188
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1191
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/protect-tool.c:1216
+#: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1221
+#: agent/protect-tool.c:1199
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "�ѥ��ե졼���������Ǥ�"
 
-#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "����󥻥�"
@@ -676,7 +708,8 @@ msgstr "�ѥ��ե졼�����ѹ�"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1338
+#: tools/gpgconf-comp.c:1641
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
@@ -824,75 +857,80 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:366
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr "����: %s\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr "̵���������إå���: "
 
-#: g10/armor.c:416
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr "�����إå���: "
 
-#: g10/armor.c:427
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr "̵���ʥ��ꥢ��̾�إå���\n"
 
-#: g10/armor.c:479
+#: g10/armor.c:455
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "�����إå���: "
+
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr "����ҤΥ��ꥢ��̾\n"
 
-#: g10/armor.c:614
+#: g10/armor.c:643
 msgid "unexpected armor: "
 msgstr "ͽ����������: "
 
-#: g10/armor.c:626
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr "̵���ʥ��å���ǥ��������פ��줿��: "
 
-#: g10/armor.c:780 g10/armor.c:1390
+#: g10/armor.c:809 g10/armor.c:1419
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "̵����64��ʸ��%02X��ȤФ��ޤ���\n"
 
-#: g10/armor.c:823
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr "�ե������������᤹���ޤ� (CRC������ޤ���)\n"
 
-#: g10/armor.c:857
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr "�ե������������᤹���ޤ� (CRC������)\n"
 
-#: g10/armor.c:865
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr "CRC�ν񼰤�����������ޤ���\n"
 
-#: g10/armor.c:869 g10/armor.c:1427
+#: g10/armor.c:898 g10/armor.c:1456
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC���顼��%06lX - %06lX\n"
 
-#: g10/armor.c:889
+#: g10/armor.c:918
 msgid "premature eof (in trailer)\n"
 msgstr "�ե������������᤹���ޤ� (����������ˤ���ޤ�)\n"
 
-#: g10/armor.c:893
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr "�����ιԤ˥��顼������ޤ�\n"
 
-#: g10/armor.c:1204
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr "ͭ����OpenPGP�ǡ��������Ĥ���ޤ���\n"
 
-#: g10/armor.c:1209
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "̵��������: �Ԥ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
 
-#: g10/armor.c:1213
+#: g10/armor.c:1242
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1211,11 +1249,11 @@ msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 
-#: g10/decrypt.c:110 g10/encode.c:890
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "��%s�פ������ޤ���\n"
@@ -1226,7 +1264,7 @@ msgstr "��%s�פ������ޤ���\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "����%s�ɤ����Ĥ���ޤ���: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1266,7 +1304,7 @@ msgstr "���θ������ˤ���������̩����%s�ɤ�����ޤ�!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "�ޤ���--delete-secret-keys�ɥ��ץ����Ǥ���������Ƥ���������\n"
 
-#: g10/encode.c:226 g10/sign.c:1296
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
@@ -1285,7 +1323,7 @@ msgstr "%s�Ź�ˡ��Ȥ��ޤ�\n"
 msgid "`%s' already compressed\n"
 msgstr "��%s�פϤ⤦���̺ѤߤǤ�\n"
 
-#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�ٹ�: ��%s�פ϶��Υե�����Ǥ�\n"
@@ -1310,24 +1348,24 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "�ٹ�: �оΰŹ�ˡ %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:669 g10/sign.c:966
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "�ٹ�: ���̥��르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:765
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "�оΰŹ�ˡ %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/encode.c:862
+#: g10/encode.c:848
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s�Ź沽 ������:��%s��\n"
@@ -1508,7 +1546,7 @@ msgstr "����%s��縰%s�����Ѥ��ޤ�\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "��%s: �������Τʤ���̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1516,132 +1554,132 @@ msgstr ""
 "@���ޥ��:\n"
 " "
 
-#: g10/gpg.c:370
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[�ե�����]|��̾�����"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: g10/gpg.c:372 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/gpg.c:375 sm/gpgsm.c:248
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/gpg.c:377 sm/gpgsm.c:249
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (����)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/gpg.c:381 sm/gpgsm.c:252
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "�����"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "���Ƚ�̾�ΰ���"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "list and check key signatures"
 msgstr "����̾�θ����Ȱ���"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/gpg.c:386 sm/gpgsm.c:254
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "��������������"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "remove keys from the public keyring"
 msgstr "�������ؤ��鸰������"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "remove keys from the secret keyring"
 msgstr "��̩���ؤ��鸰������"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "���˽�̾"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "���ؤν�̾���Խ�"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "���������������"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/gpg.c:397 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:402
 msgid "search for keys on a key server"
 msgstr "�������С��θ��򸡺�����"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "update all keys from a keyserver"
 msgstr "�������С����鸰��������������"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "�����ɹ���/ʻ��"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr "�����ɾ��֤�ɽ��"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr "�����ɤΥǡ������ѹ�"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr "�����ɤ�PIN���ѹ�"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr "|���르�ꥺ�� [�ե�����]|��å����������ɽ��"
 
-#: g10/gpg.c:430 sm/gpgsm.c:264
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1651,51 +1689,52 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:281
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
 
-#: g10/gpg.c:436 sm/gpgsm.c:293
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: g10/gpg.c:447 sm/gpgsm.c:331
+#: g10/gpg.c:449 sm/gpgsm.c:333
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "��̾������ˤ��Υ桼����id\n"
 "�����"
 
-#: g10/gpg.c:448 sm/gpgsm.c:334
+#: g10/gpg.c:450 sm/gpgsm.c:336
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|���̥�٥��N������\n"
 "(0���󰵽�)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:336
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
-msgid "use as output file"
-msgstr "���ϥե�����Ȥ��ƻ���"
+#: g10/gpg.c:469 sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "������˳�ǧ"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr "��̩��OpenPGP�ο�������"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x�ߴ��Υ�å�����������"
 
-#: g10/gpg.c:553 sm/gpgsm.c:397
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1704,7 +1743,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:400
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1724,15 +1763,15 @@ msgstr ""
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/gpg.c:750 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "�Х��򸫤Ĥ����� <gnupg-bugs@gnu.org> �ޤǤ���𤯤�������\n"
 
-#: g10/gpg.c:767
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1742,7 +1781,7 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:578
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1750,547 +1789,551 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/gpg.c:784
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr "������: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "�Ź�ˡ: "
 
-#: g10/gpg.c:798
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr "�ϥå���: "
 
-#: g10/gpg.c:805 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "����: "
 
-#: g10/gpg.c:875
+#: g10/gpg.c:817 sm/gpgsm.c:603
+msgid "Used libraries:"
+msgstr ""
+
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:715
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "��Ω���륳�ޥ��\n"
 
-#: g10/gpg.c:1063
+#: g10/gpg.c:1113
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=���椬�����롼�������%s����˸��Ĥ���ޤ���\n"
 
-#: g10/gpg.c:1260
+#: g10/gpg.c:1310
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1263
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1266
+#: g10/gpg.c:1316
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1272
+#: g10/gpg.c:1322
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1325
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1328
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1284
+#: g10/gpg.c:1334
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1337
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1340
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1296
+#: g10/gpg.c:1346
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1349
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1352
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1445
+#: g10/gpg.c:1495
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "̤�Τι������ܡ�%s��\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1594
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1602
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1610
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1612
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1825
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1981
+#: g10/gpg.c:2030
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 
-#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s�ϻȤ��ޤ���!\n"
 
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2493
+#: g10/gpg.c:2565
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: g10/gpg.c:2528
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2603
 msgid "invalid keyserver options\n"
 msgstr "̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2610
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2613
 msgid "invalid import options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2620
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2551
+#: g10/gpg.c:2623
 msgid "invalid export options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2630
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2561
+#: g10/gpg.c:2633
 msgid "invalid list options\n"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2645
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2653
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2655
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2659
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2670
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2673
 msgid "invalid verify options\n"
 msgstr "̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2855
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1298
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ�˻ȤäƤ�̵��̣�Ǥ�!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2975
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ沽��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:3014
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1370
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1378
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3092
 msgid "selected compression algorithm is invalid\n"
 msgstr "���򤵤줿���̥��르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3098
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3117
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3119
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "̵����default-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3121
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "̵����min-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3135
 msgid "invalid default preferences\n"
 msgstr "̵���ʴ��������\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3144
 msgid "invalid personal cipher preferences\n"
 msgstr "̵���ʸĿ��ѰŹ�ˡ������\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3148
 msgid "invalid personal digest preferences\n"
 msgstr "̵���ʸĿ������������\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3152
 msgid "invalid personal compress preferences\n"
 msgstr "̵���ʸĿ��Ѱ��̤�����\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3185
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3232
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3237
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3242
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3375
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3398
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3449
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3454
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3474
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3630
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3641
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3651
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å��������ǤäƤ������� ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4233
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4235
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4268
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
@@ -2302,7 +2345,7 @@ msgstr "���θ����ؤ��������ޤ�"
 msgid "make timestamp conflicts only a warning"
 msgstr "������̷���ٹ�����ˤ��ޤ�"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:372
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
@@ -2835,13 +2878,13 @@ msgstr "��%s: ���������Ǥ� - �ȤФ��ޤ�\n"
 msgid "no writable keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ��ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "��%s�פؤν����\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2369 g10/import.c:2391
+#: g10/import.c:2381 g10/import.c:2403
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "���ء�%s�פν���ߥ��顼: %s\n"
@@ -2930,7 +2973,7 @@ msgstr "��%s: ̵���ʰŹ�ˡ%d����̩���Ǥ� - �ȤФ��ޤ�\n"
 msgid "importing secret keys not allowed\n"
 msgstr "��̩�����ɹ��ߤ϶ػߤǤ�\n"
 
-#: g10/import.c:1158 g10/import.c:2384
+#: g10/import.c:1158 g10/import.c:2396
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "�������̩���ؤ�����ޤ���: %s\n"
@@ -3050,42 +3093,42 @@ msgstr "��%s: ������̾�ξ�꤬�����äƤ��ޤ� - �ȤФ��ޤ�\n"
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "��%s: ͽ�����̽�̾���饹 (0x%02X) - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1732
+#: g10/import.c:1744
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "��%s: ��ʣ�����桼����ID�θ��� - ʻ��\n"
 
-#: g10/import.c:1794
+#: g10/import.c:1806
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s�ΰ����Ф�\n"
 
-#: g10/import.c:1808
+#: g10/import.c:1820
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s���Ժߡ�\n"
 
-#: g10/import.c:1867
+#: g10/import.c:1879
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "��%s:��%s�ɼ�����������ɲ�\n"
 
-#: g10/import.c:1901
+#: g10/import.c:1913
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "��%s: ľ�ܸ���̾���ɲ�\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2302
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "����������̩�����ȹ礷�ޤ���!\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2310
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2312
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
@@ -3384,7 +3427,7 @@ msgid "Really sign? (y/N) "
 msgstr "�����˽�̾���ޤ���? (y/N) "
 
 #: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:348
+#: g10/keyedit.c:5019 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
@@ -3739,8 +3782,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "���θ��������˼������ޤ���? (y/N) "
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "���ѼԻ��꿮�ѥǡ����١����������桢��ͭ�Կ��Ѥ����ꤵ��ʤ����Ȥ⤢���"
 "����\n"
@@ -4601,13 +4643,13 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "���������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:273
+#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:275
+#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5195,17 +5237,17 @@ msgstr "̵����"
 msgid "uncompressed|none"
 msgstr "̵����|�ʤ�"
 
-#: g10/misc.c:874
+#: g10/misc.c:891
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "���Υ�å������ϡ�%s�Ǥϻ��ѤǤ��ޤ���\n"
 
-#: g10/misc.c:1049
+#: g10/misc.c:1066
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "�����ޤ��ʥ��ץ�����%s��\n"
 
-#: g10/misc.c:1074
+#: g10/misc.c:1091
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "̤�ΤΥ��ץ�����%s��\n"
@@ -5261,12 +5303,12 @@ msgstr "�ٹ�: ����Ū�˷��ݤ��оΰŹ沽���å���󸰤Ǥ�\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:603
+#: g10/passphrase.c:295 g10/passphrase.c:581
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (�縰ID %s)"
 
-#: g10/passphrase.c:327
+#: g10/passphrase.c:309
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5277,24 +5319,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u�ӥå�%s��, ID %s�������դ�%s%s\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:334
 msgid "Repeat passphrase\n"
 msgstr "�ѥ��ե졼���������\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:336
 msgid "Enter passphrase\n"
 msgstr "�ѥ��ե졼��������\n"
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:363
 msgid "cancelled by user\n"
 msgstr "�桼�����ˤ���ä�\n"
 
-#: g10/passphrase.c:384 g10/passphrase.c:450
+#: g10/passphrase.c:369 g10/passphrase.c:428
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
 
-#: g10/passphrase.c:582
+#: g10/passphrase.c:560
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5303,12 +5345,12 @@ msgstr ""
 "���Υ桼��������̩���Υ��å���������ˤ�\n"
 "�ѥ��ե졼��������ޤ�:��%s��\n"
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:568
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u�ӥå�%s��, ID %s�������դ�%s"
 
-#: g10/passphrase.c:599
+#: g10/passphrase.c:577
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (�縰ID %s ������)"
@@ -5914,69 +5956,53 @@ msgstr "��%s: ����������̾�ˤ�����������������ޤ���\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "��%s: �����б��ؤν�̾�ˤ�����������������ޤ���\n"
 
-#: g10/sign.c:82
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "����ǡ����ϡ�(PGP 2.x������) v3��̾�ˤ�����ޤ���\n"
-
-#: g10/sign.c:90
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "����ǡ����ϡ�(PGP 2.x������) v3����̾�ˤ�����ޤ���\n"
-
-#: g10/sign.c:104
+#: g10/sign.c:89
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr "�ٹ�: ɽ����%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
 
-#: g10/sign.c:121
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "�ݥꥷ��URL�ϡ�(PGP 2.x������) v3��̾�ˤ�����ޤ���\n"
-
-#: g10/sign.c:129
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr "�ݥꥷ��URL�ϡ�(PGP 2.x������) v3����̾�ˤ�����ޤ���\n"
-
-#: g10/sign.c:142
+#: g10/sign.c:115
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "�ٹ�: �ݥꥷ��URL��%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
 
-#: g10/sign.c:170
+#: g10/sign.c:138
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr "�ٹ�: �����������С�URL��%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
 
-#: g10/sign.c:343
+#: g10/sign.c:311
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/sign.c:352
+#: g10/sign.c:320
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s��̾����̾��:��%s��\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϡ�PGP 2.x�����θ���ʬΥ��̾�Ǥ�������Ǥ�\n"
 
-#: g10/sign.c:864
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/sign.c:991
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "��̾:"
 
-#: g10/sign.c:1106
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�PGP 2.x�����θ��ǥ��ꥢ��̾�����Ǥ��ޤ���\n"
 
-#: g10/sign.c:1290
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s�Ź沽����Ѥ��ޤ�\n"
@@ -6683,61 +6709,61 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s�˥��������Ǥ��ޤ��� - ̵����OpenPGP������?\n"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:114 sm/gpgsm.c:361
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 #, fuzzy
 msgid "read options from file"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:122
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:123
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:126
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:135
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "�������ޥ�ɤ�ɽ��"
 
-#: scd/scdaemon.c:209
+#: scd/scdaemon.c:210
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: scd/scdaemon.c:211
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:658
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1006
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1011
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6771,12 +6797,12 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1631
+#: sm/certchain.c:195 sm/certchain.c:1646
 #, fuzzy
 msgid "chain"
 msgstr "admin"
 
-#: sm/certchain.c:196 sm/certchain.c:1631
+#: sm/certchain.c:196 sm/certchain.c:1646
 #, fuzzy
 msgid "shell"
 msgstr "help"
@@ -6817,8 +6843,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
@@ -6987,7 +7013,7 @@ msgstr ""
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1730
+#: sm/certchain.c:1462 sm/certchain.c:1745
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "������%s�פν�ʣ\n"
@@ -7002,11 +7028,11 @@ msgstr "����������������\n"
 msgid "root certificate is good\n"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/certchain.c:1620
+#: sm/certchain.c:1635
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1629
+#: sm/certchain.c:1644
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7021,7 +7047,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7035,25 +7061,25 @@ msgstr "no"
 msgid "[none]"
 msgstr "[̤����]"
 
-#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
+#: sm/certdump.c:583 sm/certdump.c:628 sm/certdump.c:693 sm/certdump.c:746
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "���顼: ̵���ʱ�����\n"
 
-#: sm/certdump.c:558 sm/certdump.c:603
+#: sm/certdump.c:591 sm/certdump.c:636
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:640 sm/certdump.c:696
+#: sm/certdump.c:673 sm/certdump.c:729
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:665 sm/certdump.c:719
+#: sm/certdump.c:698 sm/certdump.c:752
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "���顼: ̵���ʱ�����\n"
 
-#: sm/certdump.c:936
+#: sm/certdump.c:946
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7180,190 +7206,199 @@ msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(�����Ϥ���ޤ���)\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[�ե�����]|��̾�����"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list external keys"
 msgstr "��̩���ΰ���"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
 #, fuzzy
 msgid "list certificate chain"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "�������ؤ��鸰������"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "import certificates"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "export certificates"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "register a smartcard"
 msgstr "���ޡ��ȥ����ɤظ����ɲ�"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:270
 #, fuzzy
 msgid "change a passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "ASCII���������������"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "�����å�: �������ϴ���μ���ͤȤ��Ƥ⤦����ѤߤǤ�\n"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:345
+msgid "|FILE|write a server mode log to FILE"
+msgstr ""
+
+#: sm/gpgsm.c:347
+#, fuzzy
+msgid "|FILE|write an audit log to FILE"
+msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
+
+#: sm/gpgsm.c:349
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "��̾�μ���"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:359
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "���θ����ؤ��������ޤ�"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:360
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:363
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:379
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:388
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "̤�ΤΰŹ楢�르�ꥺ��Ǥ�"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:390
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:392
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "̤�Τΰ��̥��르�ꥺ��Ǥ�"
 
-#: sm/gpgsm.c:568
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: sm/gpgsm.c:571
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7374,36 +7409,36 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: sm/gpgsm.c:650
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: sm/gpgsm.c:748
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
 
-#: sm/gpgsm.c:759
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "̤�ΤΥ��ץ�����%s��\n"
 
-#: sm/gpgsm.c:1315
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1411
+#: sm/gpgsm.c:1468
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1429
+#: sm/gpgsm.c:1486
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "��%s�פ˥��������Ǥ��ޤ���: %s\n"
 
-#: sm/gpgsm.c:1612
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7426,7 +7461,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "���֤μ������顼: %s\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:1274
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
@@ -7489,17 +7524,17 @@ msgstr "��%s�פ��ɽФ����顼: %s\n"
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:111
+#: sm/qualified.c:105
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "���顼: ̵���ʷ����λ��档\n"
 
-#: sm/qualified.c:129
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:225
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7510,13 +7545,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234 sm/verify.c:536
+#: sm/qualified.c:209 sm/verify.c:580
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:327
+#: sm/qualified.c:277
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7529,290 +7564,308 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:424
 #, fuzzy
 msgid "Signature made "
 msgstr "%s�˻ܤ��줿��̾\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:428
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:429
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "���֤μ������顼: %s\n"
 
-#: sm/verify.c:514
+#: sm/verify.c:558
 #, fuzzy
 msgid "Good signature from"
 msgstr "��%s�ɤ������������̾"
 
-#: sm/verify.c:515
+#: sm/verify.c:559
 #, fuzzy
 msgid "                aka"
 msgstr "                ��̾��%s��"
 
-#: sm/verify.c:533
+#: sm/verify.c:577
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "���ʽ�̾�ˤʤ�Ǥ��礦��\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "quit"
 
-#: tools/gpg-connect-agent.c:60
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:127
+#: tools/gpg-connect-agent.c:74
+#, fuzzy
+msgid "|FILE|run commands from FILE on startup"
+msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
+
+#: tools/gpg-connect-agent.c:75
+msgid "run /subst on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:174
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: tools/gpg-connect-agent.c:130
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:314
+#: tools/gpg-connect-agent.c:1155
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:323
+#: tools/gpg-connect-agent.c:1164
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:381
+#: tools/gpg-connect-agent.c:1219 tools/gpg-connect-agent.c:1645
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
+
+#: tools/gpg-connect-agent.c:1299
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "�Ԥ�Ĺ�����ޤ�"
 
-#: tools/gpg-connect-agent.c:385
+#: tools/gpg-connect-agent.c:1303
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:1619
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "̤�ΤΥ��ץ�����%s��\n"
 
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:1637
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 
-#: tools/gpg-connect-agent.c:473
-#, fuzzy, c-format
-msgid "receiving line failed: %s\n"
-msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
-
-#: tools/gpg-connect-agent.c:789
+#: tools/gpg-connect-agent.c:1986
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: tools/gpg-connect-agent.c:798
+#: tools/gpg-connect-agent.c:1995
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "��%s�פǿ��ѥ쥳���ɤθ������顼: %s\n"
 
-#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
-#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
+#: tools/gpgconf-comp.c:459 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:773
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:796
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
-#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
+#: tools/gpgconf-comp.c:482 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:803
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
-#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:487 tools/gpgconf-comp.c:606 tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:729 tools/gpgconf-comp.c:811
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:737
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:504
+#: tools/gpgconf-comp.c:502
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:506
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:512
+#: tools/gpgconf-comp.c:510
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:526
+#: tools/gpgconf-comp.c:524
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:527
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:531
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:535
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:539
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:543
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "�������"
 
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:547
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:710
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:669
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "�������С���URL�������ǽ\n"
 
-#: tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:674
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:719
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:744
+#: tools/gpgconf-comp.c:742
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:786
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:824
+#: tools/gpgconf-comp.c:822
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:834
+#: tools/gpgconf-comp.c:832
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:845
+#: tools/gpgconf-comp.c:843
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:850
+#: tools/gpgconf-comp.c:848
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:887
+#: tools/gpgconf-comp.c:885
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2982
+#: tools/gpgconf-comp.c:3006
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:59
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
+#, fuzzy
+msgid "list global configuration file"
+msgstr "̤�Τι������ܡ�%s��\n"
+
+#: tools/gpgconf.c:67
 #, fuzzy
 msgid "check global configuration file"
 msgstr "̤�Τι������ܡ�%s��\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:71
+msgid "use as output file"
+msgstr "���ϥե�����Ȥ��ƻ���"
+
+#: tools/gpgconf.c:75
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:100
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:176 tools/gpgconf.c:209
+#: tools/gpgconf.c:202 tools/gpgconf.c:240
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: tools/gpgconf.c:178
+#: tools/gpgconf.c:204
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:187
+#: tools/gpgconf.c:213
 #, fuzzy
 msgid "Component not found"
 msgstr "�����������Ĥ���ޤ���"
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:242
 #, fuzzy
 msgid "No argument allowed"
 msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
@@ -7906,92 +7959,104 @@ msgstr "��%s�פ��ɽФ����顼: %s\n"
 msgid "error closing %s: %s\n"
 msgstr "��%s�פǥ��顼: %s\n"
 
-#: tools/symcryptrun.c:515
+#: tools/symcryptrun.c:486
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "��֥ץ������μ¹Ԥϡ����ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: tools/symcryptrun.c:521
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:556
+#: tools/symcryptrun.c:527
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:563
+#: tools/symcryptrun.c:534
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:579
+#: tools/symcryptrun.c:550
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:578
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:636
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:653
+#: tools/symcryptrun.c:624
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:705
+#: tools/symcryptrun.c:676
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:757
+#: tools/symcryptrun.c:728
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:771
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:826
+#: tools/symcryptrun.c:797
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "�Хå����åס��ե������%s�פ������Ǥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:839
+#: tools/symcryptrun.c:810
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "�Хå����åס��ե������%s�פ������Ǥ��ޤ���: %s\n"
 
-#: tools/symcryptrun.c:1014
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1041
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1050
+#: tools/symcryptrun.c:1021
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "����ǡ����ϡ�(PGP 2.x������) v3��̾�ˤ�����ޤ���\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr "����ǡ����ϡ�(PGP 2.x������) v3����̾�ˤ�����ޤ���\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "�ݥꥷ��URL�ϡ�(PGP 2.x������) v3��̾�ˤ�����ޤ���\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr "�ݥꥷ��URL�ϡ�(PGP 2.x������) v3����̾�ˤ�����ޤ���\n"
+
 #, fuzzy
 #~ msgid "shelll"
 #~ msgstr "help"
diff --git a/po/nb.po b/po/nb.po
index 5a421d28e..ac1707534 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.3\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-09-14 13:27+0200\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
 "PO-Revision-Date: 2006-06-13 20:31+0200\n"
 "Last-Translator: Trond Endrest�l <Trond.Endrestol@fagskolen.gjovik.no>\n"
 "Language-Team: Norwegian Bokm�l <i18n-nb@lister.ping.uio.no>\n"
@@ -18,58 +18,75 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
 
-#: agent/call-pinentry.c:438
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:441
+#: agent/call-pinentry.c:551
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 
-#: agent/call-pinentry.c:489
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+#, fuzzy
+msgid "Quality:"
+msgstr "gyldighet: %s"
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 #, fuzzy
 msgid "PIN too long"
 msgstr "for lang linje"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:668
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "for lang linje"
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:676
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Ugyldig tegn i navn\n"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:535
+#: agent/call-pinentry.c:693
 #, fuzzy
 msgid "Bad PIN"
 msgstr "ugyldig MPI"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:694
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "ugyldig passfrase"
 
-#: agent/call-pinentry.c:572
+#: agent/call-pinentry.c:730
 #, fuzzy
 msgid "Passphrase"
 msgstr "ugyldig passfrase"
@@ -79,21 +96,21 @@ msgstr "ugyldig passfrase"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
-#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1865
-#: sm/gpgsm.c:1902 sm/gpgsm.c:1940 sm/qualified.c:72
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �pne �%s�: %s\n"
@@ -133,14 +150,25 @@ msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Tast inn den nye passfrasen for denne hemmelige n�kklen.\n"
 
-#: agent/command-ssh.c:2349
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "endre passfrasen"
+
+#: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2850
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/command-ssh.c:2885
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "klarte ikke � lagre n�kkelen: %s\n"
@@ -185,76 +213,66 @@ msgstr "Tast inn passfrase\n"
 msgid "Take this one anyway"
 msgstr "Bruke denne n�kkelen likevel? (j/N) "
 
-#: agent/genkey.c:185
+#: agent/genkey.c:191
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u character long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u characters long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:202
+#: agent/genkey.c:212
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digit or special character."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digits or special characters."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:225
+#: agent/genkey.c:235
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
-"passphrase may not%0Abe a known term or match certain pattern."
+"Warning: You have entered an insecure passphrase.%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:238
+#: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:240
+#: agent/genkey.c:253
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:246
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:290
+#: agent/genkey.c:306
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
 "\n"
 
-#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "endre passfrasen"
-
-#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
-#: tools/symcryptrun.c:456
-msgid "does not match - try again"
-msgstr ""
-
-#: agent/genkey.c:412
+#: agent/genkey.c:429
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "endre passfrasen"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:104
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -264,66 +282,65 @@ msgstr ""
 "Valg:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:109
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:69 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "fyldig output"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:341
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "v�re noenlunde stille"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:112
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:113
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "leser valg fra �%s�\n"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
-#: tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "s�ke etter n�kler p� en n�kkelserver"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:134
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "sette en notasjon for de valgte brukeridene"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "ikke oppdat�r tillitsdatabasen etter import"
@@ -361,148 +378,163 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:91 tools/symcryptrun.c:204
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Vennligst rapporter feil til <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:512 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:340 sm/gpgsm.c:819 sm/gpgsm.c:822 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MERK: ingen standard valgfil �%s�\n"
 
-#: agent/gpg-agent.c:610 agent/gpg-agent.c:1177 g10/gpg.c:2027
-#: scd/scdaemon.c:421 sm/gpgsm.c:914 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "valgfil �%s�: %s\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leser valg fra �%s�\n"
 
-#: agent/gpg-agent.c:947 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1247 agent/gpg-agent.c:1373 agent/gpg-agent.c:1377
-#: agent/gpg-agent.c:1418 agent/gpg-agent.c:1422 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:908
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
+#: agent/gpg-agent.c:1321
+#, c-format
+msgid "socket name `%s' is too long\n"
+msgstr ""
+
+#: agent/gpg-agent.c:1333
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
+#, fuzzy
+msgid "error getting nonce for the socket\n"
+msgstr "feil ved henting av ny PIN: %s\n"
+
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
 
-#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skriver hemmelig n�kkel til �%s�\n"
 
-#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen �%s� ble opprettet\n"
 
-#: agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1448
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) mislyktes in %s: %s\n"
 
-#: agent/gpg-agent.c:1438
+#: agent/gpg-agent.c:1452
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: agent/gpg-agent.c:1549
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
+#, fuzzy, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "feil ved lesing av �%s�: %s\n"
+
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1554
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1571
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1576
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "oppdatering av hemmelig mislyktes: %s\n"
 
-#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: hoppet over: %s\n"
 
-#: agent/gpg-agent.c:1809
+#: agent/gpg-agent.c:1850
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:756
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
-#: tools/gpg-connect-agent.c:767
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr ""
@@ -529,37 +561,37 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1188
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1191
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1216
+#: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1221
+#: agent/protect-tool.c:1199
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "ugyldig passfrase"
 
-#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "cancel|cancel"
@@ -671,7 +703,8 @@ msgstr "endre passfrasen"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1338
+#: tools/gpgconf-comp.c:1641
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
@@ -816,75 +849,80 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:366
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr "armor: %s\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr "ugyldig armorheader: "
 
-#: g10/armor.c:416
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr "armorheader: "
 
-#: g10/armor.c:427
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr "ugyldig clearsigheader\n"
 
-#: g10/armor.c:479
+#: g10/armor.c:455
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "armorheader: "
+
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr "n�stede klartekstsignaturer\n"
 
-#: g10/armor.c:614
+#: g10/armor.c:643
 msgid "unexpected armor: "
 msgstr "uforventet armering:"
 
-#: g10/armor.c:626
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr "ugyldig bindestrekbeskyttet linje: "
 
-#: g10/armor.c:780 g10/armor.c:1390
+#: g10/armor.c:809 g10/armor.c:1419
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "hoppet over ugyldig radix64-tegn %02x\n"
 
-#: g10/armor.c:823
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr "for tidlig eof (ingen CRC)\n"
 
-#: g10/armor.c:857
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr "for tidlig eof (i CRC)\n"
 
-#: g10/armor.c:865
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr "misdannet CRC\n"
 
-#: g10/armor.c:869 g10/armor.c:1427
+#: g10/armor.c:898 g10/armor.c:1456
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-feil; %06lX - %06lX\n"
 
-#: g10/armor.c:889
+#: g10/armor.c:918
 msgid "premature eof (in trailer)\n"
 msgstr "for tidlig eof (i trailer)\n"
 
-#: g10/armor.c:893
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr "feil i trailerlinje\n"
 
-#: g10/armor.c:1204
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr "ingen gyldig OpenPGP-data funnet.\n"
 
-#: g10/armor.c:1209
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ugyldig armor: linje lengre enn %d tegn\n"
 
-#: g10/armor.c:1213
+#: g10/armor.c:1242
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1201,11 +1239,11 @@ msgstr "Admin-kommandoer er ikke tillatt\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ugyldig kommando  (pr�v �help�)\n"
 
-#: g10/decrypt.c:110 g10/encode.c:890
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr "--output virker ikke for denne kommandoen\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �pne �%s�\n"
@@ -1216,7 +1254,7 @@ msgstr "kan ikke �pne �%s�\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "n�kkelen �%s� ble ikke funnet: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1256,7 +1294,7 @@ msgstr "det finnes en hemmelig n�kkel for offentlig n�kkel �%s�!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "bruk valget �--delete-secret-keys� for � slette den f�rst.\n"
 
-#: g10/encode.c:226 g10/sign.c:1296
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
@@ -1275,7 +1313,7 @@ msgstr "bruker cipher %s\n"
 msgid "`%s' already compressed\n"
 msgstr "�%s� er allerede komprimert\n"
 
-#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ADVARSEL: �%s� er en tom fil\n"
@@ -1305,7 +1343,7 @@ msgstr ""
 "ADVARSEL: p�tvinging av symmetrisk cipher %s (%d) bryter med mottakerens "
 "preferanser\n"
 
-#: g10/encode.c:669 g10/sign.c:966
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1314,18 +1352,18 @@ msgstr ""
 "ADVARSEL: tvang av kompresjonsalgoritme %s (%d) bryter med mottakerens "
 "preferanser\n"
 
-#: g10/encode.c:765
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "p�tvinging av symmetrisk cipher %s (%d) bryter med mottakerens preferanser\n"
 
-#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "du kan ikke bruke %s i %s modus\n"
 
-#: g10/encode.c:862
+#: g10/encode.c:848
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s kryptert for: \"%s\"\n"
@@ -1504,7 +1542,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:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1512,132 +1550,132 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/gpg.c:370
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[fil]|lage en signatur"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|lage en klartekstsignatur"
 
-#: g10/gpg.c:372 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "lage en adskilt signatur"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "kryptere data"
 
-#: g10/gpg.c:375 sm/gpgsm.c:248
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr "kryptering med bare symmetrisk cipher"
 
-#: g10/gpg.c:377 sm/gpgsm.c:249
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "dekryptere data (standard)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "bekrefte en signatur"
 
-#: g10/gpg.c:381 sm/gpgsm.c:252
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "liste n�kler"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "liste n�kler og signaturer"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "list and check key signatures"
 msgstr "vise og sjekke n�kkelsignaturer"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "liste n�kler og fingeravtrykk"
 
-#: g10/gpg.c:386 sm/gpgsm.c:254
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "liste hemmelige n�kler"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "generere et nytt n�kkelpar"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "remove keys from the public keyring"
 msgstr "fjerne n�kler fra det offentlige n�kkelknippet"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "remove keys from the secret keyring"
 msgstr "fjerne n�kler fra det hemmelige n�kkelknippet"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "signere en n�kkel"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "signere en n�kkel lokalt"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "signere eller redigere en n�kkel"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "generere et opphevingssertifikat"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "eksportere n�kler"
 
-#: g10/gpg.c:397 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "eksportere n�kler til en n�kkelserver"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "importere n�kler fra en n�kkelserver"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:402
 msgid "search for keys on a key server"
 msgstr "s�ke etter n�kler p� en n�kkelserver"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "update all keys from a keyserver"
 msgstr "oppdatere alle n�klene fra en n�kkelserver"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "importere/flette n�kler"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr "vis kortets status"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr "endre data p� et kort"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr "endre PIN p� et kort"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr "oppdatere tillitsdatabasen"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skrive meldingsdigester"
 
-#: g10/gpg.c:430 sm/gpgsm.c:264
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1647,47 +1685,48 @@ msgstr ""
 "Valg:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:281
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr "lage ASCII-beskyttet output"
 
-#: g10/gpg.c:436 sm/gpgsm.c:293
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAVN|kryptere for NAVN"
 
-#: g10/gpg.c:447 sm/gpgsm.c:331
+#: g10/gpg.c:449 sm/gpgsm.c:333
 msgid "use this user-id to sign or decrypt"
 msgstr "bruke denne brukeriden for signering eller dekryptering"
 
-#: g10/gpg.c:448 sm/gpgsm.c:334
+#: g10/gpg.c:450 sm/gpgsm.c:336
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sette kompresjonsniv� til N (0 sl�r av kompresjon)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:336
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr "bruk kanonisk tekstmodus"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
-msgid "use as output file"
-msgstr "bruk som outputfil"
+#: g10/gpg.c:469 sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "leser valg fra �%s�\n"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "ikke gj�r noen endringer"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "sp�r f�r overskriving"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr "bruk streng OpenPGP-oppf�rsel"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr "generere PGP 2.x-kompatible meldinger"
 
-#: g10/gpg.c:553 sm/gpgsm.c:397
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1695,7 +1734,7 @@ msgstr ""
 "@\n"
 "(Se mansiden for en komplett liste over alle kommandoene og valgene)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:400
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1715,15 +1754,15 @@ msgstr ""
 " --list-keys [navn]         vise n�kler\n"
 " --fingerprint [navn]       vise fingeravtrykk\n"
 
-#: g10/gpg.c:750 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Vennligst rapporter feil til <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:767
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1733,7 +1772,7 @@ msgstr ""
 "signere, sjekke, kryptere eller dekryptere\n"
 "standard operasjon avhenger av inputdata\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:578
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1741,73 +1780,77 @@ msgstr ""
 "\n"
 "St�ttede algoritmer:\n"
 
-#: g10/gpg.c:784
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr "Offentlig n�kkel: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:798
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:805 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Kompresjon: "
 
-#: g10/gpg.c:875
+#: g10/gpg.c:817 sm/gpgsm.c:603
+msgid "Used libraries:"
+msgstr ""
+
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:715
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "motstridende kommandoer\n"
 
-#: g10/gpg.c:1063
+#: g10/gpg.c:1113
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "fant ingen �=�-tegn i gruppedefinisjonen �%s�\n"
 
-#: g10/gpg.c:1260
+#: g10/gpg.c:1310
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� hjemmekatalogen �%s�\n"
 
-#: g10/gpg.c:1263
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1266
+#: g10/gpg.c:1316
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� utvidelsen �%s�\n"
 
-#: g10/gpg.c:1272
+#: g10/gpg.c:1322
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� hjemmekatalogen �%s�\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1325
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1328
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� utvidelsen �%s�\n"
 
-#: g10/gpg.c:1284
+#: g10/gpg.c:1334
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over hjemmekatalogen �%"
 "s�\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1337
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1815,20 +1858,20 @@ msgstr ""
 "ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over konfigurasjonsfilen "
 "�%s�\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1340
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over utvidelsen �%s�\n"
 
-#: g10/gpg.c:1296
+#: g10/gpg.c:1346
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over hjemmekatalogen "
 "�%s�\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1349
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1836,456 +1879,456 @@ msgstr ""
 "ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over "
 "konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1352
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over utvidelsen �%s�\n"
 
-#: g10/gpg.c:1445
+#: g10/gpg.c:1495
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukjent konfigurasjonspunkt �%s�\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1594
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1602
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1610
 msgid "show the keyring name in key listings"
 msgstr "vise navnet til n�kkelknippene i n�kkellister"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1612
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1825
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1981
+#: g10/gpg.c:2030
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MERK: den gamle valgfila �%s� ble ignorert\n"
 
-#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MERK: %s er ikke for vanlig bruk!\n"
 
 # Tenk litt p� denne du, Trond.
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�%s� er ikke en gyldig signaturutg�else\n"
 
-#: g10/gpg.c:2493
+#: g10/gpg.c:2565
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�%s� er ikke et gyldig tegnsett\n"
 
-#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "kunne ikke parse n�kkelserverens URL\n"
 
-#: g10/gpg.c:2528
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2603
 msgid "invalid keyserver options\n"
 msgstr "ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2610
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importvalg\n"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2613
 msgid "invalid import options\n"
 msgstr "ugyldige importvalg\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2620
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2551
+#: g10/gpg.c:2623
 msgid "invalid export options\n"
 msgstr "ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2630
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listevalg\n"
 
-#: g10/gpg.c:2561
+#: g10/gpg.c:2633
 msgid "invalid list options\n"
 msgstr "ugyldige listevalg\n"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2645
 msgid "show all notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2653
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2655
 msgid "show user ID validity during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2659
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2670
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2673
 msgid "invalid verify options\n"
 msgstr "ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunne ikke sette exec-path til %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2855
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1298
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overstyrere %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s er ikke tillatt sammen med %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er ikke fornuftig med %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2975
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "du kan bare lage adskilte eller klare signaturer i --pgp2-modus\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "du kan ikke signere og kryptere samtidig i --pgp2-modus\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "du m� bruke filer (og ikke en pipe) n�r --pgp2 er p�sl�tt\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:3014
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1370
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt krypteringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1378
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr "valg digestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3092
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt kompresjonsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3098
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt sertifikasjondigestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m� v�re st�rre enn 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-neede m� v�re st�rre enn 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3117
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth m� v�re i intervallet fra 1 til 255\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3119
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldig default-cert-level; m� v�re 0, 1, 2 eller 3\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3121
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldig min-cert-level; m� v�re 0, 1, 2 eller 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MERK: enkel S2K-modus (0) er sterkt frar�det\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K-modus; m� v�re 0, 1 eller 3\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3135
 msgid "invalid default preferences\n"
 msgstr "ugyldig standard preferanser\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3144
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldig personlig cipherpreferanser\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3148
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldig personlig digestpreferanser\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3152
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldig personlig kompresjonspreferanser\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3185
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker ikke enn� med %s\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3232
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke cipheralgoritmen �%s� i %s-modus\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3237
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke digestalgoritmen �%s� i %s-modus\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3242
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke kompresjonsalgoritmen �%s� i %s-modus\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ADVARSEL: mottakere (-r) angitt uten � bruke offentlig n�kkelkryptering\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [filnavn]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3375
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av �%s� mislyktes: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3398
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnavn]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan ikke bruke --symmtric --encrypt i %s-modus\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--sign [filnavn]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3449
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3454
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "du kan ikke bruke --symmetric --sign --encrypt i %s-modus\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3474
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnavn]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key brukerid"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key brukerid"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key brukerid [kommandoer]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sending til n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "mottak fra n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3630
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "n�kkeleksport mislyktes: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3641
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "s�k p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3651
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hashalgoritme �%s�\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr "Sett i gang og tast inn meldingen din ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4233
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angitte URLen for sertifikasjonspolicyen er ugyldig\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4235
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angitte URLen for signaturpolicy er ugyldig\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4268
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angitte URLen for den foretrukkede n�kkelserveren er ugyldig\n"
 
@@ -2297,7 +2340,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:75 sm/gpgsm.c:372
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skrive statusinfo til denne FD"
 
@@ -2760,13 +2803,13 @@ msgstr "n�kkel %s: ny n�kkel - hoppet over\n"
 msgid "no writable keyring found: %s\n"
 msgstr "ingen skrivbart n�kkelknippe funnet: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til �%s�\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2369 g10/import.c:2391
+#: g10/import.c:2381 g10/import.c:2403
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
@@ -2855,7 +2898,7 @@ msgstr "n�kkel %s: hemmelig n�kkel med ugyldig cipher %d - hoppet over\n"
 msgid "importing secret keys not allowed\n"
 msgstr "import av hemmelig n�kkel er ikke tillatt\n"
 
-#: g10/import.c:1158 g10/import.c:2384
+#: g10/import.c:1158 g10/import.c:2396
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen standard hemmelig n�kkelknippe: %s\n"
@@ -2976,41 +3019,41 @@ msgstr "n�kkel %s: undern�kkelsignatur p� feil plass - hoppet over\n"
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "n�kkel %s: uforventet signaturklasse (0x%02X) - hoppet over\n"
 
-#: g10/import.c:1732
+#: g10/import.c:1744
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "n�kkel %s: duplikert brukerid oppdaget - flettet sammen\n"
 
-#: g10/import.c:1794
+#: g10/import.c:1806
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ADVARSEL: n�kkel %s kan v�re opphevet: henter opphevingsn�kkel %s\n"
 
-#: g10/import.c:1808
+#: g10/import.c:1820
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "ADVARSEL: n�kkel %s kan v�re opphevet: opphevingsn�kkel %s ikke tilstede.\n"
 
-#: g10/import.c:1867
+#: g10/import.c:1879
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "n�kkel %s: �%s� opphevingssertifikat lagt til\n"
 
-#: g10/import.c:1901
+#: g10/import.c:1913
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "n�kkel %s: direkte n�kkelsignatur lagt til\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2302
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2298
+#: g10/import.c:2310
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr ""
 
-#: g10/import.c:2300
+#: g10/import.c:2312
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr ""
 
@@ -3306,7 +3349,7 @@ msgid "Really sign? (y/N) "
 msgstr "Virkelig signere? (j/N) "
 
 #: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:348
+#: g10/keyedit.c:5019 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering mislyktes: %s\n"
@@ -3630,8 +3673,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vil du virkelig oppheve denne undern�kkelen? (j/N) "
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
 #: g10/keyedit.c:2140
@@ -4480,7 +4522,7 @@ msgid "Key generation failed: %s\n"
 msgstr "N�kkelgenerering mislyktes: %s\n"
 
 # Er dette entallsformen av denne strengen?
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:273
+#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4489,7 +4531,7 @@ msgstr ""
 "klokkeproblem)\n"
 
 # Er dette flertallsformen av denne og den forrige strengen?
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:275
+#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5080,17 +5122,17 @@ msgstr ""
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:874
+#: g10/misc.c:891
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1049
+#: g10/misc.c:1066
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "flertydig valg �%s�\n"
 
-#: g10/misc.c:1074
+#: g10/misc.c:1091
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "ukjent valg �%s�\n"
@@ -5146,12 +5188,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:313 g10/passphrase.c:603
+#: g10/passphrase.c:295 g10/passphrase.c:581
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (hovedn�kkelid %s)"
 
-#: g10/passphrase.c:327
+#: g10/passphrase.c:309
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5162,24 +5204,24 @@ msgstr ""
 "�%.*s�\n"
 "%u-bit %s n�kkel, ID %s, opprettet %s%s\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:334
 msgid "Repeat passphrase\n"
 msgstr "Gjenta passfrase\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:336
 msgid "Enter passphrase\n"
 msgstr "Tast inn passfrase\n"
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:363
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:384 g10/passphrase.c:450
+#: g10/passphrase.c:369 g10/passphrase.c:428
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/passphrase.c:582
+#: g10/passphrase.c:560
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5188,12 +5230,12 @@ msgstr ""
 "Du trenger en passfrase for � l�se opp den hemmelige n�kkelen for\n"
 "brukeren: �%s�\n"
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:568
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit %s-n�kkel, ID %s, opprettet %s"
 
-#: g10/passphrase.c:599
+#: g10/passphrase.c:577
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5804,55 +5846,39 @@ msgstr "n�kkel %s: ingen undern�kkel for undern�kkelopphevingssignatur\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "n�kkel %s: ingen undern�kkel for undern�kkelbindingssignatur\n"
 
-#: g10/sign.c:82
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:90
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-
-#: g10/sign.c:104
+#: g10/sign.c:89
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:121
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:129
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:142
+#: g10/sign.c:115
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:170
+#: g10/sign.c:138
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:343
+#: g10/sign.c:311
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr ""
 
-#: g10/sign.c:352
+#: g10/sign.c:320
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s-signatur fra: �%s�\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:864
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5860,15 +5886,15 @@ msgstr ""
 "ADVARSEL: p�tvinging av kompresjonsalgoritme %s (%d) bryter med mottakerens "
 "preferanser\n"
 
-#: g10/sign.c:991
+#: g10/sign.c:961
 msgid "signing:"
 msgstr ""
 
-#: g10/sign.c:1106
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1290
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
@@ -6558,61 +6584,61 @@ msgstr "bekrefting av Admin PIN er forel�pig nektet gjennom denne kommandoen\n"
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\n"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:114 sm/gpgsm.c:361
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 #, fuzzy
 msgid "read options from file"
 msgstr "leser valg fra �%s�\n"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:122
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:123
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:126
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:135
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "vise admin-kommandoer"
 
-#: scd/scdaemon.c:209
+#: scd/scdaemon.c:210
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: scd/scdaemon.c:211
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:658
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1006
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1011
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6645,11 +6671,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1631
+#: sm/certchain.c:195 sm/certchain.c:1646
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1631
+#: sm/certchain.c:196 sm/certchain.c:1646
 msgid "shell"
 msgstr ""
 
@@ -6689,8 +6715,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "klarte ikke � lagre n�kkelen: %s\n"
@@ -6858,7 +6884,7 @@ msgstr ""
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1730
+#: sm/certchain.c:1462 sm/certchain.c:1745
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "preferansen %s er duplisert\n"
@@ -6873,11 +6899,11 @@ msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
 msgid "root certificate is good\n"
 msgstr "ugyldig sertifikat"
 
-#: sm/certchain.c:1620
+#: sm/certchain.c:1635
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1629
+#: sm/certchain.c:1644
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -6892,7 +6918,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6906,25 +6932,25 @@ msgstr "nei"
 msgid "[none]"
 msgstr "[ikke satt]"
 
-#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
+#: sm/certdump.c:583 sm/certdump.c:628 sm/certdump.c:693 sm/certdump.c:746
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "Feil: ugyldig respons.\n"
 
-#: sm/certdump.c:558 sm/certdump.c:603
+#: sm/certdump.c:591 sm/certdump.c:636
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:640 sm/certdump.c:696
+#: sm/certdump.c:673 sm/certdump.c:729
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:665 sm/certdump.c:719
+#: sm/certdump.c:698 sm/certdump.c:752
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "Feil: ugyldig respons.\n"
 
-#: sm/certdump.c:936
+#: sm/certdump.c:946
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7051,189 +7077,198 @@ msgstr "sleting av n�kkelblokk mislyktes: %s\n"
 msgid "no valid recipients given\n"
 msgstr "ingen gyldige adressater\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[fil]|lage en signatur"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[fil]|lage en klartekstsignatur"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list external keys"
 msgstr "liste hemmelige n�kler"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
 #, fuzzy
 msgid "list certificate chain"
 msgstr "ugyldig sertifikat"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "fjerne n�kler fra det offentlige n�kkelknippet"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "import certificates"
 msgstr "ugyldig sertifikat"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "export certificates"
 msgstr "ugyldig sertifikat"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:270
 #, fuzzy
 msgid "change a passphrase"
 msgstr "endre passfrasen"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "lage ASCII-beskyttet output"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "hoppet over: offentlig n�kkel allerede satt som standard mottaker\n"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:345
+msgid "|FILE|write a server mode log to FILE"
+msgstr ""
+
+#: sm/gpgsm.c:347
+#, fuzzy
+msgid "|FILE|write an audit log to FILE"
+msgstr "leser valg fra �%s�\n"
+
+#: sm/gpgsm.c:349
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "sjekke signaturer"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:359
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "hent n�klene fra dette n�kkelknippet"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:360
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "Trenger den hemmelige n�kkelen for � gj�re dette.\n"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:363
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAVN|kryptere for NAVN"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:379
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:388
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "ukjent kryptoalgoritme"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:390
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s signatur, digestalgoritme %s\n"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:392
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "ukjent kompresjonsalgoritme"
 
-#: sm/gpgsm.c:568
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: sm/gpgsm.c:571
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7244,36 +7279,36 @@ msgstr ""
 "signere, sjekke, kryptere eller dekryptere\n"
 "standard operasjon avhenger av inputdata\n"
 
-#: sm/gpgsm.c:650
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: sm/gpgsm.c:748
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: sm/gpgsm.c:759
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "ukjent valg �%s�\n"
 
-#: sm/gpgsm.c:1315
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1411
+#: sm/gpgsm.c:1468
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1429
+#: sm/gpgsm.c:1486
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan ikke aksere �%s�: %s\n"
 
-#: sm/gpgsm.c:1612
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7296,7 +7331,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:1274
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
@@ -7359,17 +7394,17 @@ msgstr "feil ved lesing av �%s�: %s\n"
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:111
+#: sm/qualified.c:105
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "Feil: ugyldig formattert fingeravtrykk.\n"
 
-#: sm/qualified.c:129
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:225
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7380,13 +7415,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234 sm/verify.c:536
+#: sm/qualified.c:209 sm/verify.c:580
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:327
+#: sm/qualified.c:277
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7399,289 +7434,307 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr ""
 
-#: sm/verify.c:388
+#: sm/verify.c:424
 #, fuzzy
 msgid "Signature made "
 msgstr "Signatur opprettet %s\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:428
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:429
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
 
-#: sm/verify.c:514
+#: sm/verify.c:558
 #, fuzzy
 msgid "Good signature from"
 msgstr "God signatur fra �%s�"
 
-#: sm/verify.c:515
+#: sm/verify.c:559
 #, fuzzy
 msgid "                aka"
 msgstr "                aka �%s�"
 
-#: sm/verify.c:533
+#: sm/verify.c:577
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "Dette vil v�re en selvsignatur.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "avslutt"
 
-#: tools/gpg-connect-agent.c:60
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:127
+#: tools/gpg-connect-agent.c:74
+#, fuzzy
+msgid "|FILE|run commands from FILE on startup"
+msgstr "leser valg fra �%s�\n"
+
+#: tools/gpg-connect-agent.c:75
+msgid "run /subst on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:174
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: tools/gpg-connect-agent.c:130
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:314
+#: tools/gpg-connect-agent.c:1155
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:323
+#: tools/gpg-connect-agent.c:1164
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:381
+#: tools/gpg-connect-agent.c:1219 tools/gpg-connect-agent.c:1645
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
+
+#: tools/gpg-connect-agent.c:1299
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "for lang linje"
 
-#: tools/gpg-connect-agent.c:385
+#: tools/gpg-connect-agent.c:1303
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:1619
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "ukjent valg �%s�\n"
 
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:1637
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "signering mislyktes: %s\n"
 
-#: tools/gpg-connect-agent.c:473
-#, fuzzy, c-format
-msgid "receiving line failed: %s\n"
-msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
-
-#: tools/gpg-connect-agent.c:789
+#: tools/gpg-connect-agent.c:1986
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: tools/gpg-connect-agent.c:798
+#: tools/gpg-connect-agent.c:1995
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
 
-#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
-#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
+#: tools/gpgconf-comp.c:459 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:773
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:796
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
-#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
+#: tools/gpgconf-comp.c:482 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:803
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
-#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:487 tools/gpgconf-comp.c:606 tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:729 tools/gpgconf-comp.c:811
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:737
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:504
+#: tools/gpgconf-comp.c:502
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:506
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:512
+#: tools/gpgconf-comp.c:510
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:526
+#: tools/gpgconf-comp.c:524
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:527
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:531
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:535
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:539
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:543
 msgid "|N|expire the passphrase after N days"
 msgstr ""
 
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:547
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:710
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAVN|kryptere for NAVN"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:669
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "kunne ikke parse n�kkelserverens URL\n"
 
-#: tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:674
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:719
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:744
+#: tools/gpgconf-comp.c:742
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:786
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:824
+#: tools/gpgconf-comp.c:822
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:834
+#: tools/gpgconf-comp.c:832
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:845
+#: tools/gpgconf-comp.c:843
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:850
+#: tools/gpgconf-comp.c:848
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:887
+#: tools/gpgconf-comp.c:885
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2982
+#: tools/gpgconf-comp.c:3006
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:59
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
+#, fuzzy
+msgid "list global configuration file"
+msgstr "ukjent konfigurasjonspunkt �%s�\n"
+
+#: tools/gpgconf.c:67
 #, fuzzy
 msgid "check global configuration file"
 msgstr "ukjent konfigurasjonspunkt �%s�\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:71
+msgid "use as output file"
+msgstr "bruk som outputfil"
+
+#: tools/gpgconf.c:75
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:100
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:176 tools/gpgconf.c:209
+#: tools/gpgconf.c:202 tools/gpgconf.c:240
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: tools/gpgconf.c:178
+#: tools/gpgconf.c:204
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:187
+#: tools/gpgconf.c:213
 #, fuzzy
 msgid "Component not found"
 msgstr "fant ikke offentlig n�kkel"
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:242
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Admin-kommandoer er ikke tillatt\n"
@@ -7775,88 +7828,88 @@ msgstr "feil ved lesing av �%s�: %s\n"
 msgid "error closing %s: %s\n"
 msgstr "feil med �%s�: %s\n"
 
-#: tools/symcryptrun.c:515
+#: tools/symcryptrun.c:486
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "fjernutf�ring av programmer er ikke st�ttet\n"
 
-#: tools/symcryptrun.c:521
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:556
+#: tools/symcryptrun.c:527
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: tools/symcryptrun.c:563
+#: tools/symcryptrun.c:534
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: tools/symcryptrun.c:579
+#: tools/symcryptrun.c:550
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:578
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: tools/symcryptrun.c:636
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "sleting av n�kkelblokk mislyktes: %s\n"
 
-#: tools/symcryptrun.c:653
+#: tools/symcryptrun.c:624
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: tools/symcryptrun.c:705
+#: tools/symcryptrun.c:676
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: tools/symcryptrun.c:757
+#: tools/symcryptrun.c:728
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: tools/symcryptrun.c:771
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:826
+#: tools/symcryptrun.c:797
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
 
-#: tools/symcryptrun.c:839
+#: tools/symcryptrun.c:810
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
 
-#: tools/symcryptrun.c:1014
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1041
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1050
+#: tools/symcryptrun.c:1021
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "ikke st�ttet"
diff --git a/po/pl.po b/po/pl.po
index ddcdfcc74..4bd01b4c7 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-09-14 13:27+0200\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
 "PO-Revision-Date: 2004-06-23 15:54+0200\n"
 "Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -24,59 +24,75 @@ msgstr ""
 "sig-check.c g10/sign.c g10/trustdb.c g10/verify.c g10/status.c g10/pubkey-"
 "enc.c\n"
 
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: agent/call-pinentry.c:438
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:441
+#: agent/call-pinentry.c:551
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: agent/call-pinentry.c:489
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+msgid "Quality:"
+msgstr ""
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 #, fuzzy
 msgid "PIN too long"
 msgstr "linia zbyt d�uga\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:668
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "has�o zbyt d�ugie\n"
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:676
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:535
+#: agent/call-pinentry.c:693
 #, fuzzy
 msgid "Bad PIN"
 msgstr "b��d MPI"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:694
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "niepoprawne has�o"
 
-#: agent/call-pinentry.c:572
+#: agent/call-pinentry.c:730
 #, fuzzy
 msgid "Passphrase"
 msgstr "niepoprawne has�o"
@@ -86,21 +102,21 @@ msgstr "niepoprawne has�o"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
-#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1865
-#: sm/gpgsm.c:1902 sm/gpgsm.c:1940 sm/qualified.c:72
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
@@ -140,14 +156,25 @@ msgstr "b��d zapisu zbioru kluczy '%': %s\n"
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: agent/command-ssh.c:2349
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "zmiana has�a klucza"
+
+#: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2850
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/command-ssh.c:2885
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: tworzenie tablicy skr�t�w nie powiod�o si�: %s\n"
@@ -193,75 +220,65 @@ msgstr "Has�o\n"
 msgid "Take this one anyway"
 msgstr "U�y� tego klucza pomimo to? "
 
-#: agent/genkey.c:185
+#: agent/genkey.c:191
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u character long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u characters long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:202
+#: agent/genkey.c:212
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digit or special character."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digits or special characters."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:225
+#: agent/genkey.c:235
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
-"passphrase may not%0Abe a known term or match certain pattern."
+"Warning: You have entered an insecure passphrase.%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:238
+#: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:240
+#: agent/genkey.c:253
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:246
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:290
+#: agent/genkey.c:306
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Musisz poda� d�ugie, skomplikowane has�o aby ochroni� sw�j klucz tajny.\n"
 
-#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "zmiana has�a klucza"
-
-#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
-#: tools/symcryptrun.c:456
-msgid "does not match - try again"
-msgstr ""
-
-#: agent/genkey.c:412
+#: agent/genkey.c:429
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "zmiana has�a klucza"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:104
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -271,67 +288,66 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:109
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:69 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "z dodatkowymi informacjami"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:341
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�ww"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:112
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:113
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
-#: tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "szukanie kluczy na serwerze"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:134
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "uaktualnienie bazy zaufania"
@@ -369,150 +385,165 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:91 tools/symcryptrun.c:204
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "B��dy prosimy zg�asza� na adres <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:512 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:340 sm/gpgsm.c:819 sm/gpgsm.c:822 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
-#: agent/gpg-agent.c:610 agent/gpg-agent.c:1177 g10/gpg.c:2027
-#: scd/scdaemon.c:421 sm/gpgsm.c:914 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: agent/gpg-agent.c:947 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "b��d tworzenia `%s': %s\n"
 
-#: agent/gpg-agent.c:1247 agent/gpg-agent.c:1373 agent/gpg-agent.c:1377
-#: agent/gpg-agent.c:1418 agent/gpg-agent.c:1422 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:908
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nie mo�na utworzy� katalogu ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
+#: agent/gpg-agent.c:1321
+#, fuzzy, c-format
+msgid "socket name `%s' is too long\n"
+msgstr "Poprawne uniewa�nienie certyfikatu"
+
+#: agent/gpg-agent.c:1333
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
 
-#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
+#, fuzzy
+msgid "error getting nonce for the socket\n"
+msgstr "b��d podczas tworzenia has�a: %s\n"
+
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "b��d przy wysy�aniu do ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: katalog utworzony\n"
 
-#: agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1448
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "baza zaufania: funkcja read() (n=%d) zawiod�a: %s\n"
 
-#: agent/gpg-agent.c:1438
+#: agent/gpg-agent.c:1452
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: nie mo�na utworzy� katalogu: %s\n"
 
-#: agent/gpg-agent.c:1549
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
+#, fuzzy, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "b��d odczytu ,,%s'': %s\n"
+
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1554
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1571
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1576
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "zapis zmian na kluczu prywatnym nie powi�d� si�: %s\n"
 
-#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu kluczy pomini�tych\n"
 
-#: agent/gpg-agent.c:1809
+#: agent/gpg-agent.c:1850
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
 
-#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:756
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "z�y format zmiennej �rodowiskowej GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
-#: tools/gpg-connect-agent.c:767
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "wersja %d protoko�u agenta nie jest obs�ugiwana\n"
@@ -539,40 +570,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1188
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1191
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: agent/protect-tool.c:1216
+#: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1221
+#: agent/protect-tool.c:1199
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "niepoprawne has�o"
 
-#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Anuluj"
@@ -684,7 +715,8 @@ msgstr "zmiana has�a klucza"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1338
+#: tools/gpgconf-comp.c:1641
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
@@ -833,77 +865,82 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:366
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr "opakowanie: %s\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr "niepoprawny nag��wek opakowania: "
 
-#: g10/armor.c:416
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr "nag��wek opakowania: "
 
-#: g10/armor.c:427
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr "niew�a�ciwy nag��wek dokumentu z podpisem na ko�cu\n"
 
-#: g10/armor.c:479
+#: g10/armor.c:455
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "nag��wek opakowania: "
+
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr "zagnie�d�one podpisy na ko�cu dokumentu\n"
 
-#: g10/armor.c:614
+#: g10/armor.c:643
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "nieoczekiwane opakowanie:"
 
-#: g10/armor.c:626
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr "niepoprawne oznaczenie linii minusami: "
 
-#: g10/armor.c:780 g10/armor.c:1390
+#: g10/armor.c:809 g10/armor.c:1419
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "niew�a�ciwy znak formatu radix64: ,,%02x'', zosta� pomini�ty\n"
 
-#: g10/armor.c:823
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr "przewczesny koniec pliku (brak CRC)\n"
 
-#: g10/armor.c:857
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr "przedwczesny koniec pliku (w CRC)\n"
 
-#: g10/armor.c:865
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr "b��d formatu CRC\n"
 
-#: g10/armor.c:869 g10/armor.c:1427
+#: g10/armor.c:898 g10/armor.c:1456
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "B��d sumy CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:889
+#: g10/armor.c:918
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "przedwczesny koniec pliku (w linii ko�cz�cej)\n"
 
-#: g10/armor.c:893
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr "b��d w linii ko�cz�cej\n"
 
-#: g10/armor.c:1204
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/armor.c:1209
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "b��d opakowania: linia d�u�sza ni� %d znak�w\n"
 
-#: g10/armor.c:1213
+#: g10/armor.c:1242
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1251,11 +1288,11 @@ msgstr "zapisuj� klucz tajny w '%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 
-#: g10/decrypt.c:110 g10/encode.c:890
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie dzia�a z tym poleceniem\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo�na otworzy� ,,%s''\n"
@@ -1266,7 +1303,7 @@ msgstr "nie mo�na otworzy� ,,%s''\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1309,7 +1346,7 @@ msgstr "dla klucza publicznego ,,%s'' istnieje klucz prywatny!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby go usun�� nalezy najpierw u�y� opcji \"--delete-secret-key\".\n"
 
-#: g10/encode.c:226 g10/sign.c:1296
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
@@ -1329,7 +1366,7 @@ msgstr "szyfrem %s\n"
 msgid "`%s' already compressed\n"
 msgstr ",,%s'' ju� jest skompresowany\n"
 
-#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "OSTRZE�ENIE: plik ,,%s'' jest pusty\n"
@@ -1356,24 +1393,24 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/encode.c:669 g10/sign.c:966
+#: g10/encode.c:655 g10/sign.c:936
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "wymuszone u�ycie kompresji %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/encode.c:765
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
 
-#: g10/encode.c:862
+#: g10/encode.c:848
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s zaszyfrowany dla: ,,%s''\n"
@@ -1561,7 +1598,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:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1569,133 +1606,133 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/gpg.c:370
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu pod dokumentem"
 
-#: g10/gpg.c:372 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/gpg.c:375 sm/gpgsm.c:248
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/gpg.c:377 sm/gpgsm.c:249
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lne)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/gpg.c:381 sm/gpgsm.c:252
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/gpg.c:386 sm/gpgsm.c:254
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "lista kluczy prywatnych"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "remove keys from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "remove keys from the secret keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy prywatnych"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "z�o�enie prywatnego podpisu na kluczu"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "tworzenie certyfikatu uniewa�nienia klucza"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/gpg.c:397 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:402
 msgid "search for keys on a key server"
 msgstr "szukanie kluczy na serwerze"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "update all keys from a keyserver"
 msgstr "od�wie�enie wszystkich kluczy z serwera"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "import/do��czenie kluczy"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:410
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/gpg.c:430 sm/gpgsm.c:264
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1705,47 +1742,48 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:281
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
-#: g10/gpg.c:436 sm/gpgsm.c:293
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/gpg.c:447 sm/gpgsm.c:331
+#: g10/gpg.c:449 sm/gpgsm.c:333
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/gpg.c:448 sm/gpgsm.c:334
+#: g10/gpg.c:450 sm/gpgsm.c:336
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - bez)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:336
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
-msgid "use as output file"
-msgstr "plik wyj�ciowy"
+#: g10/gpg.c:469 sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "pytanie przed nadpisaniem plik�w"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:524
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:397
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1753,7 +1791,7 @@ msgstr ""
 "@\n"
 "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:400
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1774,15 +1812,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/gpg.c:750 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:767
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1792,7 +1830,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:578
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1800,73 +1838,77 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/gpg.c:784
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
-#: g10/gpg.c:798
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr "Skr�t�w: "
 
-#: g10/gpg.c:805 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Kompresji: "
 
-#: g10/gpg.c:875
+#: g10/gpg.c:817 sm/gpgsm.c:603
+msgid "Used libraries:"
+msgstr ""
+
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/gpg.c:1045 sm/gpgsm.c:715
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/gpg.c:1063
+#: g10/gpg.c:1113
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
 
-#: g10/gpg.c:1260
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/gpg.c:1263
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/gpg.c:1266
+#: g10/gpg.c:1316
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/gpg.c:1272
+#: g10/gpg.c:1322
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1325
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1328
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/gpg.c:1284
+#: g10/gpg.c:1334
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1337
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1874,21 +1916,21 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1340
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1296
+#: g10/gpg.c:1346
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1349
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1896,475 +1938,475 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1352
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1445
+#: g10/gpg.c:1495
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nieznana opcja ,,%s''\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1594
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1602
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1610
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "okazanie, w kt�rym zbiorze znajduje si� dany klucz"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1612
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/gpg.c:1825
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1981
+#: g10/gpg.c:2030
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "UWAGA: stary domy�lny plik opcji ,,%s'' zosta� zignorowany\n"
 
-#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2493
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/gpg.c:2528
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2610
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2613
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2620
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2551
+#: g10/gpg.c:2623
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2630
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2561
+#: g10/gpg.c:2633
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2645
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2653
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2655
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2659
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2670
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2673
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nie mo�na ustawi� �cie�ki program�w wykonywalnych na %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2855
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1298
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w po��czeniu z %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2975
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "w trybie --pgp2 mo�na sk�ada� tylko podpisy oddzielne lub do��czone do "
 "tekstu\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "w trybie --pgp2 nie mo�na jednocze�nie szyfrowa� i podpisywa�\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "w trybie --pgp2 trzeba u�ywa� plik�w a nie potok�w.\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:3014
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1370
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1378
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3092
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3098
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3117
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "warto�� max-cert-depth musi mie�ci� si� w zakresie od 1 do 255\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3119
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "niew�a�ciwy domy�lny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3121
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "niew�a�ciwy minimalny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3135
 msgid "invalid default preferences\n"
 msgstr "niew�a�ciwe domy�lne ustawienia\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3144
 msgid "invalid personal cipher preferences\n"
 msgstr "niew�a�ciwe ustawienia szyfr�w\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3148
 msgid "invalid personal digest preferences\n"
 msgstr "niew�a�ciwe ustawienia skr�t�w\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3152
 msgid "invalid personal compress preferences\n"
 msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3185
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie dzia�a z %s!\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3232
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "szyfr ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3237
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "skr�t ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3242
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "kompresja ,,%s'' nie jest dost�pna w trybie %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "OSTRZE�ENIE: podano adresat�w (-r) w dzia�aniu kt�re ich nie dotyczy\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3375
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3403
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3449
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3454
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3474
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3630
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3641
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3651
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4233
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4235
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4268
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
@@ -2377,7 +2419,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:75 sm/gpgsm.c:372
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr "|FD|pisanie opisu stanu do deskryptora FD"
 
@@ -2904,13 +2946,13 @@ msgstr "klucz %08lX: nowy klucz - pomini�ty\n"
 msgid "no writable keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2369 g10/import.c:2391
+#: g10/import.c:2381 g10/import.c:2403
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
@@ -3000,7 +3042,7 @@ msgstr "klucz %08lX: klucz tajny z ustawionym szyfrem %d - pomini�ty\n"
 msgid "importing secret keys not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/import.c:1158 g10/import.c:2384
+#: g10/import.c:1158 g10/import.c:2396
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "brak domy�lego zbioru kluczy tajnych: %s\n"
@@ -3124,46 +3166,46 @@ msgstr "klucz %08lX: pomini�to - podpis na podkluczu w niew�a�ciwym miejscu\n"
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "klucz %08lX: pomini�to - nieoczekiwana klasa podpisu (%02x)\n"
 
-#: g10/import.c:1732
+#: g10/import.c:1744
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "key %08lX: do��czono powt�rzony identyfikator u�ytkownika\n"
 
-#: g10/import.c:1794
+#: g10/import.c:1806
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewazniony:\n"
 "             zapytanie o uniewa�niaj�cy klucz %08lX w serwerze kluczy\n"
 
-#: g10/import.c:1808
+#: g10/import.c:1820
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewa�niony:\n"
 "             brak uniewa�niaj�cego klucza %08lX.\n"
 
-#: g10/import.c:1867
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "klucz %08lX: ,,%s'' dodany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:1901
+#: g10/import.c:1913
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "klucz %08lX: dodano bezpo�redni podpis\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2302
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "klucz publiczny nie pasuje do klucza prywatngeo!\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2310
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2312
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
@@ -3490,7 +3532,7 @@ msgid "Really sign? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
 #: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:348
+#: g10/keyedit.c:5019 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
@@ -3856,8 +3898,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
 #: g10/keyedit.c:2140
@@ -4746,7 +4787,7 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:273
+#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4754,7 +4795,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:275
+#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5356,17 +5397,17 @@ msgstr "Nieskompresowany"
 msgid "uncompressed|none"
 msgstr "Nieskompresowany"
 
-#: g10/misc.c:874
+#: g10/misc.c:891
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "ta wiadomo�� mo�e nie da� si� odczyta� za pomoc� %s\n"
 
-#: g10/misc.c:1049
+#: g10/misc.c:1066
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: g10/misc.c:1074
+#: g10/misc.c:1091
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nieznany domy�lny adresat ,,%s''\n"
@@ -5425,12 +5466,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:603
+#: g10/passphrase.c:295 g10/passphrase.c:581
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (podklucz %08lX)"
 
-#: g10/passphrase.c:327
+#: g10/passphrase.c:309
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5441,24 +5482,24 @@ msgstr ""
 "\"%.*s\".\n"
 "Klucz o d�ugo�ci %u bit�w, typ %s, numer %08lX, stworzony %s%s\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:334
 msgid "Repeat passphrase\n"
 msgstr "Powt�rzone has�o\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:336
 msgid "Enter passphrase\n"
 msgstr "Has�o\n"
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:363
 msgid "cancelled by user\n"
 msgstr "anulowano przez u�ytkownika\n"
 
-#: g10/passphrase.c:384 g10/passphrase.c:450
+#: g10/passphrase.c:369 g10/passphrase.c:428
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem agenta: zwr�ci� 0x%lx\n"
 
-#: g10/passphrase.c:582
+#: g10/passphrase.c:560
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5468,12 +5509,12 @@ msgstr ""
 "Musisz poda� has�o aby odbezpieczy� klucz prywatny u�ytkownika:\n"
 "\""
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:568
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�ugo�� %u bit�w, typ %s, numer %08lX, stworzony %s"
 
-#: g10/passphrase.c:599
+#: g10/passphrase.c:577
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6118,33 +6159,14 @@ msgstr "klucz %08lX: brak podklucza, kt�rego dotyczy uniewa�nienie\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "klucz %08lX: brak podklucza dowi�zywanego podpisem\n"
 
-#: g10/sign.c:82
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "nie mo�na umie�ci� adnotacji w podpisach sk�adanych kluczami PGP 2.x\n"
-
-#: g10/sign.c:90
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-"nie mo�na umie�ci� adnotacji w podpisach kluczy sk�adanych kluczami PGP 2.x\n"
-
-#: g10/sign.c:104
+#: g10/sign.c:89
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "OSTRZE�ENIE: nie mo�na rozwin�� %% w URL adnotacji (jest zbyt d�ugi).\n"
 "             U�yty zostanie nie rozwini�ty.\n"
 
-#: g10/sign.c:121
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"nie mo�na umie�ci� URL-a regulaminu w podpisach sk�adanych kluczami PGP 2.x\n"
-
-#: g10/sign.c:129
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-"w podpisach dla PGP 2.x nie mo�na umie�ci� URL-a do regulaminu podpisu\n"
-
-#: g10/sign.c:142
+#: g10/sign.c:115
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6152,7 +6174,7 @@ msgstr ""
 "OSTRZE�ENIE: nie mo�na rozwin�� znacznik�w %% w URL regulaminu\n"
 "           (jest zbyt d�ugi). U�yty zostanie nie rozwini�ty.\n"
 
-#: g10/sign.c:170
+#: g10/sign.c:138
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6161,37 +6183,37 @@ msgstr ""
 "OSTRZE�ENIE: nie mo�na rozwin�� znacznik�w %% w URL regulaminu\n"
 "           (jest zbyt d�ugi). U�yty zostanie nie rozwini�ty.\n"
 
-#: g10/sign.c:343
+#: g10/sign.c:311
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 
-#: g10/sign.c:352
+#: g10/sign.c:320
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s podpis z�o�ony przez: ,,%s''\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "kluczami PGP 2 w trybie --pgp2 mo�na podpisywa� tylko do oddzielonych "
 "podpis�w\n"
 
-#: g10/sign.c:864
+#: g10/sign.c:834
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/sign.c:991
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:1106
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "w trybie --pgp2 mo�na podpisywa� tylko za pomoc� kluczy z wersji 2.x\n"
 
-#: g10/sign.c:1290
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "zostanie u�yty szyfr %s\n"
@@ -6905,64 +6927,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:114 sm/gpgsm.c:361
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 #, fuzzy
 msgid "read options from file"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "bez odwo�a� do terminala"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:135
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "sprzeczne polecenia\n"
 
-#: scd/scdaemon.c:209
+#: scd/scdaemon.c:210
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Wywo�anie: gpgm [opcje] [pliki] (-h podaje pomoc)"
 
-#: scd/scdaemon.c:211
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:658
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1006
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1011
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6996,11 +7018,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1631
+#: sm/certchain.c:195 sm/certchain.c:1646
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1631
+#: sm/certchain.c:196 sm/certchain.c:1646
 #, fuzzy
 msgid "shell"
 msgstr "pomoc"
@@ -7041,8 +7063,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
@@ -7220,7 +7242,7 @@ msgstr ""
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1730
+#: sm/certchain.c:1462 sm/certchain.c:1745
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "Poprawne uniewa�nienie certyfikatu"
@@ -7237,11 +7259,11 @@ msgstr ""
 "Brak certyfikat�w o niezdefiniowanym poziomie zaufania.\n"
 "\n"
 
-#: sm/certchain.c:1620
+#: sm/certchain.c:1635
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1629
+#: sm/certchain.c:1644
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7256,7 +7278,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7270,25 +7292,25 @@ msgstr "nie"
 msgid "[none]"
 msgstr "nieznany"
 
-#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
+#: sm/certdump.c:583 sm/certdump.c:628 sm/certdump.c:693 sm/certdump.c:746
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: sm/certdump.c:558 sm/certdump.c:603
+#: sm/certdump.c:591 sm/certdump.c:636
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:640 sm/certdump.c:696
+#: sm/certdump.c:673 sm/certdump.c:729
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:665 sm/certdump.c:719
+#: sm/certdump.c:698 sm/certdump.c:752
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: sm/certdump.c:936
+#: sm/certdump.c:946
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7415,181 +7437,190 @@ msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(nie podano)\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu pod dokumentem"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list external keys"
 msgstr "lista kluczy prywatnych"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Poprawne uniewa�nienie certyfikatu"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "import certificates"
 msgstr "Poprawny certyfikat"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "export certificates"
 msgstr "Poprawny certyfikat"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:270
 #, fuzzy
 msgid "change a passphrase"
 msgstr "zmiana has�a klucza"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "use the default key as default recipient"
 msgstr "domy�lny klucz jest domy�lnym adresatem"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr "bez odwo�a� do terminala"
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:345
+msgid "|FILE|write a server mode log to FILE"
+msgstr ""
+
+#: sm/gpgsm.c:347
+#, fuzzy
+msgid "|FILE|write an audit log to FILE"
+msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
+
+#: sm/gpgsm.c:349
 msgid "force v3 signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpis�w"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr "do szyfrowania b�dzie u�ywany MDC"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: �adnych pyta�"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr "automatyczna odpowied� tak na wi�kszo�� pyta�"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr "automatyczna odpowied� nie na wi�kszo�� pyta�"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:359
 msgid "add this keyring to the list of keyrings"
 msgstr "dodanie zbioru kluczy do u�ywanych"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:360
 msgid "add this secret keyring to the list"
 msgstr "dodanie zbioru kluczy tajnych do u�ywanych"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|ustawienie NAZWA jako domy�lnego klucza prywatnego"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|serwer kluczy w kt�rym b�d� poszukiwane"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:363
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAZWA| strona kodowa wy�wietlanego tekstu"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:379
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:388
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|wymuszenie algorytmu szyfruj�cego NAZWA"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:390
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|wymuszenie algorytmu skr�tu  NAZWA"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:392
 msgid "|N|use compress algorithm N"
 msgstr "|N|wymuszenie algorytmu kompresji N"
 
-#: sm/gpgsm.c:568
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpgm [opcje] [pliki] (-h podaje pomoc)"
 
-#: sm/gpgsm.c:571
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7600,36 +7631,36 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: sm/gpgsm.c:650
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "spos�b u�ycia: gpgm [opcje]"
 
-#: sm/gpgsm.c:748
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
 
-#: sm/gpgsm.c:759
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "nieznany domy�lny adresat ,,%s''\n"
 
-#: sm/gpgsm.c:1315
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1411
+#: sm/gpgsm.c:1468
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: sm/gpgsm.c:1429
+#: sm/gpgsm.c:1486
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nie mo�na zamkn�� ,,%s'': %s\n"
 
-#: sm/gpgsm.c:1612
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7652,7 +7683,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:1274
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
@@ -7715,17 +7746,17 @@ msgstr "b��d odczytu ,,%s'': %s\n"
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:111
+#: sm/qualified.c:105
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: sm/qualified.c:129
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:225
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7736,13 +7767,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234 sm/verify.c:536
+#: sm/qualified.c:209 sm/verify.c:580
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:327
+#: sm/qualified.c:277
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7755,294 +7786,312 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:424
 #, fuzzy
 msgid "Signature made "
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:428
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:429
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: sm/verify.c:514
+#: sm/verify.c:558
 #, fuzzy
 msgid "Good signature from"
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: sm/verify.c:515
+#: sm/verify.c:559
 #, fuzzy
 msgid "                aka"
 msgstr "                        alias \""
 
-#: sm/verify.c:533
+#: sm/verify.c:577
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr ""
 "\n"
 "To b�dzie podpis klucza nim samym.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "wyj�cie"
 
-#: tools/gpg-connect-agent.c:60
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:127
+#: tools/gpg-connect-agent.c:74
+#, fuzzy
+msgid "|FILE|run commands from FILE on startup"
+msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
+
+#: tools/gpg-connect-agent.c:75
+msgid "run /subst on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:174
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: tools/gpg-connect-agent.c:130
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:314
+#: tools/gpg-connect-agent.c:1155
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:323
+#: tools/gpg-connect-agent.c:1164
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:381
+#: tools/gpg-connect-agent.c:1219 tools/gpg-connect-agent.c:1645
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
+
+#: tools/gpg-connect-agent.c:1299
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "linia zbyt d�uga\n"
 
-#: tools/gpg-connect-agent.c:385
+#: tools/gpg-connect-agent.c:1303
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:1619
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "nieznany domy�lny adresat ,,%s''\n"
 
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:1637
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
 
-#: tools/gpg-connect-agent.c:473
-#, fuzzy, c-format
-msgid "receiving line failed: %s\n"
-msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
-
-#: tools/gpg-connect-agent.c:789
+#: tools/gpg-connect-agent.c:1986
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "b��d przy wysy�aniu do ,,%s'': %s\n"
 
-#: tools/gpg-connect-agent.c:798
+#: tools/gpg-connect-agent.c:1995
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "b��d przy wysy�aniu do ,,%s'': %s\n"
 
-#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
-#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
+#: tools/gpgconf-comp.c:459 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:773
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:796
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
-#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
+#: tools/gpgconf-comp.c:482 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:803
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "umo�liwienie pe�nego �ledzenia programu"
 
-#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
-#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:487 tools/gpgconf-comp.c:606 tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:729 tools/gpgconf-comp.c:811
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:737
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:504
+#: tools/gpgconf-comp.c:502
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:506
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:512
+#: tools/gpgconf-comp.c:510
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:526
+#: tools/gpgconf-comp.c:524
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:527
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:531
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:535
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:539
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:543
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|N-ty tryb obliczania has�a"
 
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:547
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:710
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:669
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:674
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:719
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|ALG|wymuszenie algorytmu szyfruj�cego ALG dla has�a"
 
-#: tools/gpgconf-comp.c:744
+#: tools/gpgconf-comp.c:742
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:786
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:824
+#: tools/gpgconf-comp.c:822
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:834
+#: tools/gpgconf-comp.c:832
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:845
+#: tools/gpgconf-comp.c:843
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:850
+#: tools/gpgconf-comp.c:848
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:887
+#: tools/gpgconf-comp.c:885
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2982
+#: tools/gpgconf-comp.c:3006
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:59
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
+#, fuzzy
+msgid "list global configuration file"
+msgstr "nieznana opcja ,,%s''\n"
+
+#: tools/gpgconf.c:67
 #, fuzzy
 msgid "check global configuration file"
 msgstr "nieznana opcja ,,%s''\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:71
+msgid "use as output file"
+msgstr "plik wyj�ciowy"
+
+#: tools/gpgconf.c:75
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:100
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:176 tools/gpgconf.c:209
+#: tools/gpgconf.c:202 tools/gpgconf.c:240
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: tools/gpgconf.c:178
+#: tools/gpgconf.c:204
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:187
+#: tools/gpgconf.c:213
 #, fuzzy
 msgid "Component not found"
 msgstr "brak klucza publicznego"
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:242
 #, fuzzy
 msgid "No argument allowed"
 msgstr "zapisuj� klucz tajny w '%s'\n"
@@ -8136,92 +8185,110 @@ msgstr "b��d odczytu ,,%s'': %s\n"
 msgid "error closing %s: %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: tools/symcryptrun.c:515
+#: tools/symcryptrun.c:486
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "odwo�ania do zewn�trznych program�w s� wy��czone\n"
 
-#: tools/symcryptrun.c:521
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:556
+#: tools/symcryptrun.c:527
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: tools/symcryptrun.c:563
+#: tools/symcryptrun.c:534
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: tools/symcryptrun.c:579
+#: tools/symcryptrun.c:550
 #, fuzzy, c-format
 msgid "could not fork: %s\n"
 msgstr "%s: nie znaleziono u�ytkownika %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:578
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: tools/symcryptrun.c:636
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: tools/symcryptrun.c:653
+#: tools/symcryptrun.c:624
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: tools/symcryptrun.c:705
+#: tools/symcryptrun.c:676
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: tools/symcryptrun.c:757
+#: tools/symcryptrun.c:728
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: tools/symcryptrun.c:771
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:826
+#: tools/symcryptrun.c:797
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: tools/symcryptrun.c:839
+#: tools/symcryptrun.c:810
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: tools/symcryptrun.c:1014
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1041
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1050
+#: tools/symcryptrun.c:1021
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "nie mo�na umie�ci� adnotacji w podpisach sk�adanych kluczami PGP 2.x\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "nie mo�na umie�ci� adnotacji w podpisach kluczy sk�adanych kluczami PGP 2."
+#~ "x\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "nie mo�na umie�ci� URL-a regulaminu w podpisach sk�adanych kluczami PGP 2."
+#~ "x\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "w podpisach dla PGP 2.x nie mo�na umie�ci� URL-a do regulaminu podpisu\n"
+
 #, fuzzy
 #~ msgid "shelll"
 #~ msgstr "pomoc"
diff --git a/po/pt.po b/po/pt.po
index 5df820133..fa9b4f6d5 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-09-14 13:27+0200\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -17,59 +17,75 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: agent/call-pinentry.c:438
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:441
+#: agent/call-pinentry.c:551
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/call-pinentry.c:489
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+msgid "Quality:"
+msgstr ""
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 #, fuzzy
 msgid "PIN too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:668
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:676
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter inv�lido no nome\n"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:535
+#: agent/call-pinentry.c:693
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorreto"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:694
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frase secreta incorrecta"
 
-#: agent/call-pinentry.c:572
+#: agent/call-pinentry.c:730
 #, fuzzy
 msgid "Passphrase"
 msgstr "frase secreta incorrecta"
@@ -79,21 +95,21 @@ msgstr "frase secreta incorrecta"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
-#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1865
-#: sm/gpgsm.c:1902 sm/gpgsm.c:1940 sm/qualified.c:72
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -133,14 +149,25 @@ msgstr "erro na escrita do porta-chaves `%s': %s\n"
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/command-ssh.c:2349
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "muda a frase secreta"
+
+#: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2850
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/command-ssh.c:2885
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: falha ao criar tabela de dispers�o: %s\n"
@@ -185,76 +212,66 @@ msgstr "Insira a frase secreta\n"
 msgid "Take this one anyway"
 msgstr "Usar esta chave de qualquer modo? "
 
-#: agent/genkey.c:185
+#: agent/genkey.c:191
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u character long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u characters long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:202
+#: agent/genkey.c:212
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digit or special character."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digits or special characters."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:225
+#: agent/genkey.c:235
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
-"passphrase may not%0Abe a known term or match certain pattern."
+"Warning: You have entered an insecure passphrase.%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:238
+#: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:240
+#: agent/genkey.c:253
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:246
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:290
+#: agent/genkey.c:306
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "muda a frase secreta"
-
-#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
-#: tools/symcryptrun.c:456
-msgid "does not match - try again"
-msgstr ""
-
-#: agent/genkey.c:412
+#: agent/genkey.c:429
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:104
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -264,67 +281,66 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:109
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:69 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detalhado"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:341
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:112
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:113
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
-#: tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:134
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizar a base de dados de confian�a"
@@ -362,150 +378,165 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:91 tools/symcryptrun.c:204
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:512 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:340 sm/gpgsm.c:819 sm/gpgsm.c:822 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, 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:610 agent/gpg-agent.c:1177 g10/gpg.c:2027
-#: scd/scdaemon.c:421 sm/gpgsm.c:914 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: agent/gpg-agent.c:947 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: agent/gpg-agent.c:1247 agent/gpg-agent.c:1373 agent/gpg-agent.c:1377
-#: agent/gpg-agent.c:1418 agent/gpg-agent.c:1422 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:908
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
+#: agent/gpg-agent.c:1321
+#, c-format
+msgid "socket name `%s' is too long\n"
+msgstr ""
+
+#: agent/gpg-agent.c:1333
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
+#, fuzzy
+msgid "error getting nonce for the socket\n"
+msgstr "erro na cria��o da frase secreta: %s\n"
+
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directoria criada\n"
 
-#: agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1448
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1438
+#: agent/gpg-agent.c:1452
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: agent/gpg-agent.c:1549
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
+#, fuzzy, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1554
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1571
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1576
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignorado: %s\n"
 
-#: agent/gpg-agent.c:1809
+#: agent/gpg-agent.c:1850
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:756
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
 
-#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
-#: tools/gpg-connect-agent.c:767
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "a vers�o %d do protocolo gpg-agent n�o � suportada\n"
@@ -532,40 +563,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1188
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1191
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/protect-tool.c:1216
+#: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1221
+#: agent/protect-tool.c:1199
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "frase secreta incorrecta"
 
-#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "cancelado pelo utilizador\n"
@@ -677,7 +708,8 @@ msgstr "muda a frase secreta"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1338
+#: tools/gpgconf-comp.c:1641
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -827,77 +859,82 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:366
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr "cabe�alho de armadura inv�lido: "
 
-#: g10/armor.c:416
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr "cabe�alho de armadura: "
 
-#: g10/armor.c:427
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr "cabe�alho de assinatura em texto puro inv�lido\n"
 
-#: g10/armor.c:479
+#: g10/armor.c:455
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "cabe�alho de armadura: "
+
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr "assinaturas em texto puro aninhadas\n"
 
-#: g10/armor.c:614
+#: g10/armor.c:643
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:626
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr "linha com h�fen inv�lida: "
 
-#: g10/armor.c:780 g10/armor.c:1390
+#: g10/armor.c:809 g10/armor.c:1419
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caracter radix64 inv�lido %02x ignorado\n"
 
-#: g10/armor.c:823
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr "fim de ficheiro prematuro (sem CRC)\n"
 
-#: g10/armor.c:857
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr "fim de ficheiro prematuro (no CRC)\n"
 
-#: g10/armor.c:865
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:869 g10/armor.c:1427
+#: g10/armor.c:898 g10/armor.c:1456
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:889
+#: g10/armor.c:918
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fim de ficheiro prematuro (no \"Trailer\")\n"
 
-#: g10/armor.c:893
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr "erro na �ltima linha\n"
 
-#: g10/armor.c:1204
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:1209
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inv�lida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1213
+#: g10/armor.c:1242
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1243,11 +1280,11 @@ msgstr "a escrever chave privada para `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/decrypt.c:110 g10/encode.c:890
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr "--output n�o funciona para este comando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
@@ -1258,7 +1295,7 @@ msgstr "imposs�vel abrir `%s'\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1301,7 +1338,7 @@ msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utilize a op��o \"--delete-secret-keys\" para a apagar primeiro.\n"
 
-#: g10/encode.c:226 g10/sign.c:1296
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -1320,7 +1357,7 @@ msgstr "assinatura falhou: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "%s' j� comprimido\n"
 
-#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um ficheiro vazio\n"
@@ -1348,7 +1385,7 @@ msgid ""
 msgstr ""
 "ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
 
-#: g10/encode.c:669 g10/sign.c:966
+#: g10/encode.c:655 g10/sign.c:936
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1357,18 +1394,18 @@ msgstr ""
 "ao for�ar o algoritmo de compress�o %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/encode.c:765
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
 
-#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/encode.c:862
+#: g10/encode.c:848
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
@@ -1552,7 +1589,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:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1560,133 +1597,133 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:370
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:372 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/gpg.c:375 sm/gpgsm.c:248
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra sim�trica"
 
-#: g10/gpg.c:377 sm/gpgsm.c:249
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "decifrar dados (ac��o por omiss�o)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:381 sm/gpgsm.c:252
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:386 sm/gpgsm.c:254
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "remove keys from the public keyring"
 msgstr "remover chaves do porta-chaves p�blico"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "remove keys from the secret keyring"
 msgstr "remover chaves do porta-chaves secreto"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:397 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor de chaves"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:402
 msgid "search for keys on a key server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "update all keys from a keyserver"
 msgstr "actualizar todas as chaves a partir de um servidor de chaves"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:410
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confian�a"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:430 sm/gpgsm.c:264
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1696,51 +1733,52 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:281
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:436 sm/gpgsm.c:293
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:447 sm/gpgsm.c:331
+#: g10/gpg.c:449 sm/gpgsm.c:333
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou decifrar"
 
-#: g10/gpg.c:448 sm/gpgsm.c:334
+#: g10/gpg.c:450 sm/gpgsm.c:336
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:336
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
-msgid "use as output file"
-msgstr "usar como ficheiro de sa�da"
+#: g10/gpg.c:469 sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "perguntar antes de sobrep�r"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:524
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:397
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1748,7 +1786,7 @@ msgstr ""
 "@\n"
 "(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:400
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1768,15 +1806,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/gpg.c:750 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:767
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1786,7 +1824,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:578
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1794,559 +1832,563 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:784
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr "Chave p�blica: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:798
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr "Dispers�o: "
 
-#: g10/gpg.c:805 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Compress�o: "
 
-#: g10/gpg.c:875
+#: g10/gpg.c:817 sm/gpgsm.c:603
+msgid "Used libraries:"
+msgstr ""
+
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:715
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/gpg.c:1063
+#: g10/gpg.c:1113
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "nenhum sinal = encontrada na defini��o de grupo \"%s\"\n"
 
-#: g10/gpg.c:1260
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1263
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1266
+#: g10/gpg.c:1316
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1272
+#: g10/gpg.c:1322
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1325
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1328
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1284
+#: g10/gpg.c:1334
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1337
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1340
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1296
+#: g10/gpg.c:1346
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1349
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1352
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1445
+#: g10/gpg.c:1495
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1594
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1602
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1610
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostrar em que porta-chave a chave est�"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1612
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1825
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1981
+#: g10/gpg.c:2030
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: o ficheiro antigo de op��es por omiss�o `%s' foi ignorado\n"
 
-#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2493
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/gpg.c:2528
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2610
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2613
 msgid "invalid import options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2620
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2551
+#: g10/gpg.c:2623
 msgid "invalid export options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2630
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2561
+#: g10/gpg.c:2633
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2645
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2653
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2655
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2659
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2670
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2673
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2855
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1298
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2975
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode fazer assinaturas separadas ou em texto puro no modo --pgp2\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "n�o pode assinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "deve utilizar ficheiros (e n�o um 'pipe') quando trabalho no modo --pgp2.\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:3014
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1370
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1378
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3092
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3098
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3117
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3119
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3121
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3135
 msgid "invalid default preferences\n"
 msgstr "prefer�ncias por omiss�o inv�lidas\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3144
 msgid "invalid personal cipher preferences\n"
 msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3148
 msgid "invalid personal digest preferences\n"
 msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3152
 msgid "invalid personal compress preferences\n"
 msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3185
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3232
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3237
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3242
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: destinat�rios (-r) dados sem utilizar uma cifra de chave p�blica\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3375
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3403
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3449
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3454
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3474
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3626
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3628
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3630
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3641
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3651
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4233
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica de certifica��o dada � inv�lida\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4235
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4268
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
@@ -2361,7 +2403,7 @@ msgstr "Remover esta chave do porta-chaves?"
 msgid "make timestamp conflicts only a warning"
 msgstr "conflito de \"timestamp\""
 
-#: g10/gpgv.c:75 sm/gpgsm.c:372
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DF|escrever informa��es de estado para o\n"
@@ -2892,13 +2934,13 @@ msgstr "chave %08lX: chave nova - ignorada\n"
 msgid "no writable keyring found: %s\n"
 msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2369 g10/import.c:2391
+#: g10/import.c:2381 g10/import.c:2403
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
@@ -2988,7 +3030,7 @@ msgstr "chave %08lX: chave secreta com cifra inv�lida %d - ignorada\n"
 msgid "importing secret keys not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/import.c:1158 g10/import.c:2384
+#: g10/import.c:1158 g10/import.c:2396
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "sem porta-chaves p�blico por omiss�o: %s\n"
@@ -3111,45 +3153,45 @@ msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: classe de assinatura inesperada (%02x) - ignorada\n"
 
-#: g10/import.c:1732
+#: g10/import.c:1744
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
 
-#: g10/import.c:1794
+#: g10/import.c:1806
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: a transferir a chave de revoca��o %"
 "08lX\n"
 
-#: g10/import.c:1808
+#: g10/import.c:1820
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revoca��o %08lX n�o "
 "presente.\n"
 
-#: g10/import.c:1867
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
 
-#: g10/import.c:1901
+#: g10/import.c:1913
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: assinatura directa de chave adicionada\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2302
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2298
+#: g10/import.c:2310
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2312
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
@@ -3476,7 +3518,7 @@ msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
 #: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:348
+#: g10/keyedit.c:5019 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -3842,8 +3884,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voc� quer realmente revogar esta chave? "
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
 #: g10/keyedit.c:2140
@@ -4726,7 +4767,7 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:273
+#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4734,7 +4775,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:275
+#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5341,17 +5382,17 @@ msgstr "n�o processado"
 msgid "uncompressed|none"
 msgstr "n�o processado"
 
-#: g10/misc.c:874
+#: g10/misc.c:891
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "esta mensagem poder� n�o ser utiliz�vel pelo %s\n"
 
-#: g10/misc.c:1049
+#: g10/misc.c:1066
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/misc.c:1074
+#: g10/misc.c:1091
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
@@ -5408,12 +5449,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:603
+#: g10/passphrase.c:295 g10/passphrase.c:581
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:327
+#: g10/passphrase.c:309
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5426,24 +5467,24 @@ msgstr ""
 "\"%.*s\"\n"
 "chave %u bits %s, ID %08lx, criada %s%s\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:334
 msgid "Repeat passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:336
 msgid "Enter passphrase\n"
 msgstr "Insira a frase secreta\n"
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:363
 msgid "cancelled by user\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: g10/passphrase.c:384 g10/passphrase.c:450
+#: g10/passphrase.c:369 g10/passphrase.c:428
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
-#: g10/passphrase.c:582
+#: g10/passphrase.c:560
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5453,12 +5494,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "utilizador: \""
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:568
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:599
+#: g10/passphrase.c:577
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6093,33 +6134,14 @@ msgstr "chave %08lX: sem subchave para o pacote revoca��o de subchave\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/sign.c:82
-#, fuzzy
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
-
-#: g10/sign.c:90
-#, fuzzy
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
-
-#: g10/sign.c:104
+#: g10/sign.c:89
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).  A "
 "utilizar n�o expandida.\n"
 
-#: g10/sign.c:121
-#, fuzzy
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
-
-#: g10/sign.c:129
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:142
+#: g10/sign.c:115
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6127,7 +6149,7 @@ msgstr ""
 "AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).\n"
 "A utilizar n�o expandida.\n"
 
-#: g10/sign.c:170
+#: g10/sign.c:138
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6136,21 +6158,21 @@ msgstr ""
 "AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).\n"
 "A utilizar n�o expandida.\n"
 
-#: g10/sign.c:343
+#: g10/sign.c:311
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
 
-#: g10/sign.c:352
+#: g10/sign.c:320
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode assinar-desligar com chaves do tipo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:864
+#: g10/sign.c:834
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6158,15 +6180,15 @@ msgstr ""
 "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/sign.c:991
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "a assinar:"
 
-#: g10/sign.c:1106
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode assinar � vista com chaves do tipo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:1290
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "ser� utilizada a cifragem %s\n"
@@ -6881,64 +6903,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:114 sm/gpgsm.c:361
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 #, fuzzy
 msgid "read options from file"
 msgstr "a ler op��es de `%s'\n"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "nunca usar o terminal"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:135
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "comandos em conflito\n"
 
-#: scd/scdaemon.c:209
+#: scd/scdaemon.c:210
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: scd/scdaemon.c:211
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:658
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1006
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1011
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6972,11 +6994,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1631
+#: sm/certchain.c:195 sm/certchain.c:1646
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1631
+#: sm/certchain.c:196 sm/certchain.c:1646
 #, fuzzy
 msgid "shell"
 msgstr "help"
@@ -7017,8 +7039,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
@@ -7186,7 +7208,7 @@ msgstr ""
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1730
+#: sm/certchain.c:1462 sm/certchain.c:1745
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "prefer�ncia %c%lu duplicada\n"
@@ -7201,11 +7223,11 @@ msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
 msgid "root certificate is good\n"
 msgstr "certificado incorrecto"
 
-#: sm/certchain.c:1620
+#: sm/certchain.c:1635
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1629
+#: sm/certchain.c:1644
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7220,7 +7242,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7234,25 +7256,25 @@ msgstr "n�o"
 msgid "[none]"
 msgstr "vers�o desconhecida"
 
-#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
+#: sm/certdump.c:583 sm/certdump.c:628 sm/certdump.c:693 sm/certdump.c:746
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: sm/certdump.c:558 sm/certdump.c:603
+#: sm/certdump.c:591 sm/certdump.c:636
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:640 sm/certdump.c:696
+#: sm/certdump.c:673 sm/certdump.c:729
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:665 sm/certdump.c:719
+#: sm/certdump.c:698 sm/certdump.c:752
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: sm/certdump.c:936
+#: sm/certdump.c:946
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7381,185 +7403,194 @@ msgstr "remo��o do bloco de chave falhou: %s\n"
 msgid "no valid recipients given\n"
 msgstr "resposta do agente inv�lida\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list external keys"
 msgstr "listar as chaves secretas"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
 #, fuzzy
 msgid "list certificate chain"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "remover chaves do porta-chaves p�blico"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "import certificates"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "export certificates"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:270
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muda a frase secreta"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "criar sa�da com armadura ascii"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "use the default key as default recipient"
 msgstr "usar a chave por omiss�o como destinat�rio por omiss�o"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:345
+msgid "|FILE|write a server mode log to FILE"
+msgstr ""
+
+#: sm/gpgsm.c:347
+#, fuzzy
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
+
+#: sm/gpgsm.c:349
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para cifrar"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr "modo n�o-interactivo: nunca perguntar"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:359
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "adicionar este porta-chaves\n"
 "� lista de porta-chaves"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:360
 msgid "add this secret keyring to the list"
 msgstr "adicionar este porta-chaves secreto � lista"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omiss�o"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:363
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:379
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:388
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:390
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:392
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: sm/gpgsm.c:568
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: sm/gpgsm.c:571
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7570,36 +7601,36 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: sm/gpgsm.c:650
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [op��es] "
 
-#: sm/gpgsm.c:748
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "imposs�vel ligar a `%s': %s\n"
 
-#: sm/gpgsm.c:759
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
 
-#: sm/gpgsm.c:1315
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1411
+#: sm/gpgsm.c:1468
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: sm/gpgsm.c:1429
+#: sm/gpgsm.c:1486
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "imposs�vel fechar `%s': %s\n"
 
-#: sm/gpgsm.c:1612
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7622,7 +7653,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:1274
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -7685,17 +7716,17 @@ msgstr "erro na leitura de `%s': %s\n"
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:111
+#: sm/qualified.c:105
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: sm/qualified.c:129
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:225
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7706,13 +7737,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234 sm/verify.c:536
+#: sm/qualified.c:209 sm/verify.c:580
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:327
+#: sm/qualified.c:277
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7725,295 +7756,313 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:424
 #, fuzzy
 msgid "Signature made "
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:428
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:429
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/verify.c:514
+#: sm/verify.c:558
 #, fuzzy
 msgid "Good signature from"
 msgstr "Assinatura correcta de \""
 
-#: sm/verify.c:515
+#: sm/verify.c:559
 #, fuzzy
 msgid "                aka"
 msgstr "                   ou \""
 
-#: sm/verify.c:533
+#: sm/verify.c:577
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr ""
 "\n"
 "Isto ser� uma auto-assinatura.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "sair"
 
-#: tools/gpg-connect-agent.c:60
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:127
+#: tools/gpg-connect-agent.c:74
+#, fuzzy
+msgid "|FILE|run commands from FILE on startup"
+msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
+
+#: tools/gpg-connect-agent.c:75
+msgid "run /subst on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:174
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: tools/gpg-connect-agent.c:130
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:314
+#: tools/gpg-connect-agent.c:1155
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:323
+#: tools/gpg-connect-agent.c:1164
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:381
+#: tools/gpg-connect-agent.c:1219 tools/gpg-connect-agent.c:1645
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "remo��o do bloco de chave falhou: %s\n"
+
+#: tools/gpg-connect-agent.c:1299
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "frase secreta demasiado longa\n"
 
-#: tools/gpg-connect-agent.c:385
+#: tools/gpg-connect-agent.c:1303
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:1619
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
 
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:1637
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: tools/gpg-connect-agent.c:473
-#, fuzzy, c-format
-msgid "receiving line failed: %s\n"
-msgstr "remo��o do bloco de chave falhou: %s\n"
-
-#: tools/gpg-connect-agent.c:789
+#: tools/gpg-connect-agent.c:1986
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:798
+#: tools/gpg-connect-agent.c:1995
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
-#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
+#: tools/gpgconf-comp.c:459 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:773
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:796
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
-#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
+#: tools/gpgconf-comp.c:482 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:803
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
-#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:487 tools/gpgconf-comp.c:606 tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:729 tools/gpgconf-comp.c:811
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:737
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:504
+#: tools/gpgconf-comp.c:502
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:506
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:512
+#: tools/gpgconf-comp.c:510
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:526
+#: tools/gpgconf-comp.c:524
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:527
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:531
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:535
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:539
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:543
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|usar mode de frase secreta N"
 
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:547
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:710
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOME|cifrar para NOME"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:669
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:674
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:719
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: tools/gpgconf-comp.c:744
+#: tools/gpgconf-comp.c:742
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:786
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:824
+#: tools/gpgconf-comp.c:822
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:834
+#: tools/gpgconf-comp.c:832
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:845
+#: tools/gpgconf-comp.c:843
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:850
+#: tools/gpgconf-comp.c:848
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:887
+#: tools/gpgconf-comp.c:885
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2982
+#: tools/gpgconf-comp.c:3006
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:59
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
+#, fuzzy
+msgid "list global configuration file"
+msgstr "criado um novo ficheiro de configura��o `%s'\n"
+
+#: tools/gpgconf.c:67
 #, fuzzy
 msgid "check global configuration file"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:71
+msgid "use as output file"
+msgstr "usar como ficheiro de sa�da"
+
+#: tools/gpgconf.c:75
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:100
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:176 tools/gpgconf.c:209
+#: tools/gpgconf.c:202 tools/gpgconf.c:240
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uso: gpg [op��es] "
 
-#: tools/gpgconf.c:178
+#: tools/gpgconf.c:204
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:187
+#: tools/gpgconf.c:213
 #, fuzzy
 msgid "Component not found"
 msgstr "chave p�blica n�o encontrada"
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:242
 #, fuzzy
 msgid "No argument allowed"
 msgstr "a escrever chave privada para `%s'\n"
@@ -8107,92 +8156,104 @@ msgstr "erro na leitura de `%s': %s\n"
 msgid "error closing %s: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/symcryptrun.c:515
+#: tools/symcryptrun.c:486
 msgid "no --program option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:521
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:556
+#: tools/symcryptrun.c:527
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: tools/symcryptrun.c:563
+#: tools/symcryptrun.c:534
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: tools/symcryptrun.c:579
+#: tools/symcryptrun.c:550
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:578
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:636
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: tools/symcryptrun.c:653
+#: tools/symcryptrun.c:624
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:705
+#: tools/symcryptrun.c:676
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:757
+#: tools/symcryptrun.c:728
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:771
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:826
+#: tools/symcryptrun.c:797
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: tools/symcryptrun.c:839
+#: tools/symcryptrun.c:810
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: tools/symcryptrun.c:1014
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1041
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1050
+#: tools/symcryptrun.c:1021
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 
 #, fuzzy
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
+
+#, fuzzy
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
+
+#, fuzzy
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
+
+#, fuzzy
 #~ msgid "shelll"
 #~ msgstr "help"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 420e99fca..2a36b86b3 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-09-14 13:27+0200\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
 "PO-Revision-Date: 2007-08-16 11:35+0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -21,59 +21,75 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: agent/call-pinentry.c:438
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:441
+#: agent/call-pinentry.c:551
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Por favor digite a frase secreta"
 
-#: agent/call-pinentry.c:489
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+msgid "Quality:"
+msgstr ""
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 #, fuzzy
 msgid "PIN too long"
 msgstr "linha muito longa\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:668
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "linha muito longa\n"
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:676
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caractere inv�lido no nome\n"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:535
+#: agent/call-pinentry.c:693
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorreto"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:694
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frase secreta incorreta"
 
-#: agent/call-pinentry.c:572
+#: agent/call-pinentry.c:730
 #, fuzzy
 msgid "Passphrase"
 msgstr "frase secreta incorreta"
@@ -83,21 +99,21 @@ msgstr "frase secreta incorreta"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
-#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1865
-#: sm/gpgsm.c:1902 sm/gpgsm.c:1940 sm/qualified.c:72
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -137,14 +153,25 @@ msgstr "erro na escrita do chaveiro `%': %s\n"
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Por favor digite a frase secreta"
 
-#: agent/command-ssh.c:2349
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "muda a frase secreta"
+
+#: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2850
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/command-ssh.c:2885
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
@@ -190,76 +217,66 @@ msgstr "Digite a frase secreta: "
 msgid "Take this one anyway"
 msgstr "Usa esta chave de qualquer modo? "
 
-#: agent/genkey.c:185
+#: agent/genkey.c:191
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u character long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u characters long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:202
+#: agent/genkey.c:212
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digit or special character."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digits or special characters."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:225
+#: agent/genkey.c:235
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
-"passphrase may not%0Abe a known term or match certain pattern."
+"Warning: You have entered an insecure passphrase.%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:238
+#: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:240
+#: agent/genkey.c:253
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:246
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:290
+#: agent/genkey.c:306
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "muda a frase secreta"
-
-#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
-#: tools/symcryptrun.c:456
-msgid "does not match - try again"
-msgstr ""
-
-#: agent/genkey.c:412
+#: agent/genkey.c:429
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:104
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -269,66 +286,65 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:109
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:69 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detalhado"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:341
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:112
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:113
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
-#: tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "exportar chaves para um servidor"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:134
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "atualizar o banco de dados de confiabilidade"
@@ -366,148 +382,163 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:91 tools/symcryptrun.c:204
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:512 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:340 sm/gpgsm.c:819 sm/gpgsm.c:822 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, 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:610 agent/gpg-agent.c:1177 g10/gpg.c:2027
-#: scd/scdaemon.c:421 sm/gpgsm.c:914 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: agent/gpg-agent.c:947 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, fuzzy, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:1247 agent/gpg-agent.c:1373 agent/gpg-agent.c:1377
-#: agent/gpg-agent.c:1418 agent/gpg-agent.c:1422 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:908
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
+#: agent/gpg-agent.c:1321
+#, fuzzy, c-format
+msgid "socket name `%s' is too long\n"
+msgstr "Certificado de revoga��o v�lido"
+
+#: agent/gpg-agent.c:1333
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
+#, fuzzy
+msgid "error getting nonce for the socket\n"
+msgstr "erro na cria��o da frase secreta: %s\n"
+
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: diret�rio criado\n"
 
-#: agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1448
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1438
+#: agent/gpg-agent.c:1452
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
 
-#: agent/gpg-agent.c:1549
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
+#, fuzzy, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1554
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1571
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1576
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves ignoradas\n"
 
-#: agent/gpg-agent.c:1809
+#: agent/gpg-agent.c:1850
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:756
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
-#: tools/gpg-connect-agent.c:767
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:1964
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
@@ -534,40 +565,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1188
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor digite a frase secreta"
 
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1191
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Por favor digite a frase secreta"
 
-#: agent/protect-tool.c:1216
+#: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1221
+#: agent/protect-tool.c:1199
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Por favor digite a frase secreta"
 
-#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "frase secreta incorreta"
 
-#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 msgid "cancelled\n"
 msgstr ""
 
@@ -678,7 +709,8 @@ msgstr "muda a frase secreta"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1338
+#: tools/gpgconf-comp.c:1641
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -826,77 +858,82 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:366
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr "cabe�alho de armadura inv�lido: "
 
-#: g10/armor.c:416
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr "cabe�alho de armadura: "
 
-#: g10/armor.c:427
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr "cabe�alho de assinatura em texto puro inv�lido\n"
 
-#: g10/armor.c:479
+#: g10/armor.c:455
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "cabe�alho de armadura: "
+
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr "assinaturas em texto puro aninhadas\n"
 
-#: g10/armor.c:614
+#: g10/armor.c:643
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:626
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr "linha com h�fen inv�lida: "
 
-#: g10/armor.c:780 g10/armor.c:1390
+#: g10/armor.c:809 g10/armor.c:1419
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caractere radix64 inv�lido %02x ignorado\n"
 
-#: g10/armor.c:823
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr "fim de arquivo prematuro (sem CRC)\n"
 
-#: g10/armor.c:857
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr "fim de arquivo prematuro (no CRC)\n"
 
-#: g10/armor.c:865
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:869 g10/armor.c:1427
+#: g10/armor.c:898 g10/armor.c:1456
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:889
+#: g10/armor.c:918
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fim de arquivo prematuro (no \"Trailer\")\n"
 
-#: g10/armor.c:893
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr "erro na linha \"trailer\"\n"
 
-#: g10/armor.c:1204
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:1209
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inv�lida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1213
+#: g10/armor.c:1242
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1246,11 +1283,11 @@ msgstr "escrevendo certificado privado para `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/decrypt.c:110 g10/encode.c:890
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
@@ -1261,7 +1298,7 @@ msgstr "imposs�vel abrir `%s'\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
@@ -1305,7 +1342,7 @@ msgstr "h� uma chave secreta para esta chave p�blica!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use a op��o \"--delete-secret-key\" para delet�-la antes.\n"
 
-#: g10/encode.c:226 g10/sign.c:1296
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -1324,7 +1361,7 @@ msgstr "assinatura falhou: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
@@ -1349,24 +1386,24 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/encode.c:669 g10/sign.c:966
+#: g10/encode.c:655 g10/sign.c:936
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/encode.c:765
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 
-#: g10/encode.c:862
+#: g10/encode.c:848
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s criptografado para: %s\n"
@@ -1551,7 +1588,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:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1559,139 +1596,139 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:370
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:372 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/gpg.c:375 sm/gpgsm.c:248
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/gpg.c:377 sm/gpgsm.c:249
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:381 sm/gpgsm.c:252
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:386 sm/gpgsm.c:254
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:397 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:402
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importar chaves de um servidor"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:410
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:430 sm/gpgsm.c:264
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1701,57 +1738,58 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:281
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:436 sm/gpgsm.c:293
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/gpg.c:447 sm/gpgsm.c:331
+#: g10/gpg.c:449 sm/gpgsm.c:333
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/gpg.c:448 sm/gpgsm.c:334
+#: g10/gpg.c:450 sm/gpgsm.c:336
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:336
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
-msgid "use as output file"
-msgstr "usar como arquivo de sa�da"
+#: g10/gpg.c:469 sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:523
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:524
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:397
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:556 sm/gpgsm.c:400
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1771,15 +1809,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/gpg.c:750 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:767
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1789,7 +1827,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:578
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1797,569 +1835,573 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:784
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:791 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:798
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:805 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 #, fuzzy
 msgid "Compression: "
 msgstr "Coment�rio: "
 
-#: g10/gpg.c:875
+#: g10/gpg.c:817 sm/gpgsm.c:603
+msgid "Used libraries:"
+msgstr ""
+
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:715
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/gpg.c:1063
+#: g10/gpg.c:1113
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1260
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1263
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1266
+#: g10/gpg.c:1316
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1272
+#: g10/gpg.c:1322
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1325
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1328
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1284
+#: g10/gpg.c:1334
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1337
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1340
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1296
+#: g10/gpg.c:1346
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1349
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1352
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1445
+#: g10/gpg.c:1495
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1594
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1602
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1610
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1612
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1825
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1981
+#: g10/gpg.c:2030
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2493
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/gpg.c:2528
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2610
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2613
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2620
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2551
+#: g10/gpg.c:2623
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2630
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2561
+#: g10/gpg.c:2633
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2645
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2653
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2655
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2659
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2670
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2673
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2855
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1298
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2975
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:3014
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1370
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1378
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3092
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3098
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3117
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3119
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3121
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3135
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3144
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3148
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3152
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3185
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3232
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3237
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3242
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3375
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3449
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3454
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3474
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3626
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3628
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3630
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3641
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3651
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
 # "hash" poderia ser "espalhamento", mas n�o fica claro
-#: g10/gpg.c:3727
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4233
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4235
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4268
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
@@ -2374,7 +2416,7 @@ msgstr "Deletar esta chave do chaveiro? "
 msgid "make timestamp conflicts only a warning"
 msgstr "conflito de \"timestamp\""
 
-#: g10/gpgv.c:75 sm/gpgsm.c:372
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DA|escrever informa��es de estado para o\n"
@@ -2851,13 +2893,13 @@ msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 msgid "no writable keyring found: %s\n"
 msgstr "imposs�vel escrever chaveiro: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2369 g10/import.c:2391
+#: g10/import.c:2381 g10/import.c:2403
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
@@ -2947,7 +2989,7 @@ msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 msgid "importing secret keys not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/import.c:1158 g10/import.c:2384
+#: g10/import.c:1158 g10/import.c:2396
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
@@ -3069,42 +3111,42 @@ msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1732
+#: g10/import.c:1744
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de usu�rio duplicado - unido\n"
 
-#: g10/import.c:1794
+#: g10/import.c:1806
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/import.c:1808
+#: g10/import.c:1820
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/import.c:1867
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1901
+#: g10/import.c:1913
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2302
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "lid %lu n�o tem chave\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2310
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2312
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
@@ -3417,7 +3459,7 @@ msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
 #: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:348
+#: g10/keyedit.c:5019 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -3785,8 +3827,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voc� realmente quer revogar esta chave? "
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
 #: g10/keyedit.c:2140
@@ -4667,7 +4708,7 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:273
+#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4675,7 +4716,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:275
+#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5288,17 +5329,17 @@ msgstr "n�o processado(s)"
 msgid "uncompressed|none"
 msgstr "n�o processado(s)"
 
-#: g10/misc.c:874
+#: g10/misc.c:891
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1049
+#: g10/misc.c:1066
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/misc.c:1074
+#: g10/misc.c:1091
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
@@ -5355,12 +5396,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:603
+#: g10/passphrase.c:295 g10/passphrase.c:581
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:327
+#: g10/passphrase.c:309
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5372,26 +5413,26 @@ msgstr ""
 "usu�rio: \"%.*s\"\n"
 "%u-bit %s chave, ID %08lX, criada %s%s\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:334
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:336
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:363
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:384 g10/passphrase.c:450
+#: g10/passphrase.c:369 g10/passphrase.c:428
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/passphrase.c:582
+#: g10/passphrase.c:560
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5401,12 +5442,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "usu�rio: \""
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:568
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:599
+#: g10/passphrase.c:577
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6043,69 +6084,53 @@ msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/sign.c:82
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:90
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-
-#: g10/sign.c:104
+#: g10/sign.c:89
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:121
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:129
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-
-#: g10/sign.c:142
+#: g10/sign.c:115
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:170
+#: g10/sign.c:138
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:343
+#: g10/sign.c:311
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "leitura de registro de assinatura falhou: %s\n"
 
-#: g10/sign.c:352
+#: g10/sign.c:320
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:864
+#: g10/sign.c:834
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/sign.c:991
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "assinando:"
 
-#: g10/sign.c:1106
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1290
+#: g10/sign.c:1260
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "descriptografia falhou: %s\n"
@@ -6824,64 +6849,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:114 sm/gpgsm.c:361
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 #, fuzzy
 msgid "read options from file"
 msgstr "lendo op��es de `%s'\n"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "nunca usar o terminal"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:135
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "comandos conflitantes\n"
 
-#: scd/scdaemon.c:209
+#: scd/scdaemon.c:210
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpgm [op��es] [arquivos] (-h para ajuda)"
 
-#: scd/scdaemon.c:211
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:658
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1006
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1011
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6914,11 +6939,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1631
+#: sm/certchain.c:195 sm/certchain.c:1646
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1631
+#: sm/certchain.c:196 sm/certchain.c:1646
 #, fuzzy
 msgid "shell"
 msgstr "help"
@@ -6959,8 +6984,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
@@ -7138,7 +7163,7 @@ msgstr ""
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1730
+#: sm/certchain.c:1462 sm/certchain.c:1745
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "Certificado de revoga��o v�lido"
@@ -7155,11 +7180,11 @@ msgstr ""
 "Nenhum certificado com confian�a indefinida encontrado.\n"
 "\n"
 
-#: sm/certchain.c:1620
+#: sm/certchain.c:1635
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1629
+#: sm/certchain.c:1644
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7174,7 +7199,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7188,25 +7213,25 @@ msgstr "n�o"
 msgid "[none]"
 msgstr "vers�o desconhecida"
 
-#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
+#: sm/certdump.c:583 sm/certdump.c:628 sm/certdump.c:693 sm/certdump.c:746
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: sm/certdump.c:558 sm/certdump.c:603
+#: sm/certdump.c:591 sm/certdump.c:636
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:640 sm/certdump.c:696
+#: sm/certdump.c:673 sm/certdump.c:729
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:665 sm/certdump.c:719
+#: sm/certdump.c:698 sm/certdump.c:752
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: sm/certdump.c:936
+#: sm/certdump.c:946
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7335,183 +7360,192 @@ msgstr "enumera��o de blocos de chaves falhou: %s\n"
 msgid "no valid recipients given\n"
 msgstr "nenhum endere�o v�lido\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list external keys"
 msgstr "listar as chaves secretas"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Certificado de revoga��o v�lido"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificado correto"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificado correto"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:270
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muda a frase secreta"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "criar sa�da com armadura ascii"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "use the default key as default recipient"
 msgstr "usar a chave padr�o como destinat�rio padr�o"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:345
+msgid "|FILE|write a server mode log to FILE"
+msgstr ""
+
+#: sm/gpgsm.c:347
+#, fuzzy
+msgid "|FILE|write an audit log to FILE"
+msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
+
+#: sm/gpgsm.c:349
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr "modo n�o-interativo: nunca perguntar"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:359
 msgid "add this keyring to the list of keyrings"
 msgstr "adicionar este chaveiro � lista de chaveiros"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:360
 msgid "add this secret keyring to the list"
 msgstr "adicionar este chaveiro secreto � lista"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta padr�o"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:363
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:379
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:388
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:390
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:392
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: sm/gpgsm.c:568
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpgm [op��es] [arquivos] (-h para ajuda)"
 
-#: sm/gpgsm.c:571
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7522,36 +7556,36 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: sm/gpgsm.c:650
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Uso: gpgm [op��es] "
 
-#: sm/gpgsm.c:748
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/gpgsm.c:759
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: sm/gpgsm.c:1315
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1411
+#: sm/gpgsm.c:1468
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: sm/gpgsm.c:1429
+#: sm/gpgsm.c:1486
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/gpgsm.c:1612
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7574,7 +7608,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:1274
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -7637,17 +7671,17 @@ msgstr "erro na leitura de `%s': %s\n"
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:111
+#: sm/qualified.c:105
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: sm/qualified.c:129
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:225
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7658,13 +7692,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234 sm/verify.c:536
+#: sm/qualified.c:209 sm/verify.c:580
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:327
+#: sm/qualified.c:277
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7677,295 +7711,313 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "leitura de registro de assinatura falhou: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:424
 #, fuzzy
 msgid "Signature made "
 msgstr "Esta chave n�o � protegida.\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:428
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:429
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/verify.c:514
+#: sm/verify.c:558
 #, fuzzy
 msgid "Good signature from"
 msgstr "Assinatura correta de \""
 
-#: sm/verify.c:515
+#: sm/verify.c:559
 #, fuzzy
 msgid "                aka"
 msgstr "                   ou \""
 
-#: sm/verify.c:533
+#: sm/verify.c:577
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
 # INICIO MENU
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "sair"
 
-#: tools/gpg-connect-agent.c:60
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:127
+#: tools/gpg-connect-agent.c:74
+#, fuzzy
+msgid "|FILE|run commands from FILE on startup"
+msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
+
+#: tools/gpg-connect-agent.c:75
+msgid "run /subst on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:174
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: tools/gpg-connect-agent.c:130
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:314
+#: tools/gpg-connect-agent.c:1155
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:323
+#: tools/gpg-connect-agent.c:1164
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:381
+#: tools/gpg-connect-agent.c:1219 tools/gpg-connect-agent.c:1645
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "enumera��o de blocos de chaves falhou: %s\n"
+
+#: tools/gpg-connect-agent.c:1299
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "linha muito longa\n"
 
-#: tools/gpg-connect-agent.c:385
+#: tools/gpg-connect-agent.c:1303
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:1619
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:1637
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: tools/gpg-connect-agent.c:473
-#, fuzzy, c-format
-msgid "receiving line failed: %s\n"
-msgstr "enumera��o de blocos de chaves falhou: %s\n"
-
-#: tools/gpg-connect-agent.c:789
+#: tools/gpg-connect-agent.c:1986
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:798
+#: tools/gpg-connect-agent.c:1995
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
-#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
+#: tools/gpgconf-comp.c:459 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:773
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:796
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
-#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
+#: tools/gpgconf-comp.c:482 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:803
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "habilitar depura��o completa"
 
-#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
-#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:487 tools/gpgconf-comp.c:606 tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:729 tools/gpgconf-comp.c:811
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:737
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:504
+#: tools/gpgconf-comp.c:502
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:506
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:512
+#: tools/gpgconf-comp.c:510
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:526
+#: tools/gpgconf-comp.c:524
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:527
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:531
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:535
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:539
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:543
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|usar frase secreta modo N"
 
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:547
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:710
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOME|criptografar para NOME"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:669
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:674
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:719
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: tools/gpgconf-comp.c:744
+#: tools/gpgconf-comp.c:742
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:786
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:824
+#: tools/gpgconf-comp.c:822
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:834
+#: tools/gpgconf-comp.c:832
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:845
+#: tools/gpgconf-comp.c:843
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:850
+#: tools/gpgconf-comp.c:848
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:887
+#: tools/gpgconf-comp.c:885
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2982
+#: tools/gpgconf-comp.c:3006
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:59
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
+#, fuzzy
+msgid "list global configuration file"
+msgstr "%s: novo arquivo de op��es criado\n"
+
+#: tools/gpgconf.c:67
 #, fuzzy
 msgid "check global configuration file"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:71
+msgid "use as output file"
+msgstr "usar como arquivo de sa�da"
+
+#: tools/gpgconf.c:75
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:100
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:176 tools/gpgconf.c:209
+#: tools/gpgconf.c:202 tools/gpgconf.c:240
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uso: gpg [op��es] "
 
-#: tools/gpgconf.c:178
+#: tools/gpgconf.c:204
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:187
+#: tools/gpgconf.c:213
 #, fuzzy
 msgid "Component not found"
 msgstr "chave p�blica n�o encontrada"
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:242
 #, fuzzy
 msgid "No argument allowed"
 msgstr "escrevendo certificado privado para `%s'\n"
@@ -8059,87 +8111,87 @@ msgstr "erro na leitura de `%s': %s\n"
 msgid "error closing %s: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/symcryptrun.c:515
+#: tools/symcryptrun.c:486
 msgid "no --program option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:521
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:556
+#: tools/symcryptrun.c:527
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: tools/symcryptrun.c:563
+#: tools/symcryptrun.c:534
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: tools/symcryptrun.c:579
+#: tools/symcryptrun.c:550
 #, fuzzy, c-format
 msgid "could not fork: %s\n"
 msgstr "%s: usu�rio n�o encontrado: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:578
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:636
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: tools/symcryptrun.c:653
+#: tools/symcryptrun.c:624
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:705
+#: tools/symcryptrun.c:676
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:757
+#: tools/symcryptrun.c:728
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: tools/symcryptrun.c:771
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:826
+#: tools/symcryptrun.c:797
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: tools/symcryptrun.c:839
+#: tools/symcryptrun.c:810
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: tools/symcryptrun.c:1014
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1041
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1050
+#: tools/symcryptrun.c:1021
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
diff --git a/po/ro.po b/po/ro.po
index 89eec3ab4..24f931521 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc1\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-09-14 13:27+0200\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
 "PO-Revision-Date: 2005-05-31 22:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -18,18 +18,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "am e�uat s� stochez amprenta: %s\n"
 
-#: agent/call-pinentry.c:438
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:441
+#: agent/call-pinentry.c:551
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -37,41 +37,58 @@ msgid ""
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/call-pinentry.c:489
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+#, fuzzy
+msgid "Quality:"
+msgstr "validitate: %s"
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 #, fuzzy
 msgid "PIN too long"
 msgstr "linie prea lung�"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:668
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "fraz�-parol� prea lung�\n"
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:676
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter invalid �n nume\n"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:535
+#: agent/call-pinentry.c:693
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorect"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:694
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "fraz�-parol� incorect�"
 
-#: agent/call-pinentry.c:572
+#: agent/call-pinentry.c:730
 #, fuzzy
 msgid "Passphrase"
 msgstr "fraz�-parol� incorect�"
@@ -81,21 +98,21 @@ msgstr "fraz�-parol� incorect�"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritm rezumat %d nu este suportat\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
-#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1865
-#: sm/gpgsm.c:1902 sm/gpgsm.c:1940 sm/qualified.c:72
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nu pot deschide `%s': %s\n"
@@ -136,14 +153,25 @@ msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/command-ssh.c:2349
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "schimb� fraza-parol�"
+
+#: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2850
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/command-ssh.c:2885
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: am e�uat s� creez hashtable: %s\n"
@@ -188,76 +216,66 @@ msgstr "Introduce�i fraza-parol�\n"
 msgid "Take this one anyway"
 msgstr "Folosi�i oricum aceast� cheie? (d/N) "
 
-#: agent/genkey.c:185
+#: agent/genkey.c:191
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u character long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u characters long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:202
+#: agent/genkey.c:212
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digit or special character."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digits or special characters."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:225
+#: agent/genkey.c:235
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
-"passphrase may not%0Abe a known term or match certain pattern."
+"Warning: You have entered an insecure passphrase.%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:238
+#: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:240
+#: agent/genkey.c:253
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:246
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:290
+#: agent/genkey.c:306
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a v� proteja cheia secret�.\n"
 "\n"
 
-#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "schimb� fraza-parol�"
-
-#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
-#: tools/symcryptrun.c:456
-msgid "does not match - try again"
-msgstr ""
-
-#: agent/genkey.c:412
+#: agent/genkey.c:429
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:104
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -267,66 +285,65 @@ msgstr ""
 "Op�iuni:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:109
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:69 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "locvace"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:341
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "fii oarecum mai t�cut"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:112
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:113
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
-#: tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "caut� pentru chei pe un server de chei"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:134
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizeaz� baza de date de �ncredere"
@@ -364,150 +381,165 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:91 tools/symcryptrun.c:204
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Raporta�i bug-uri la <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:512 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:340 sm/gpgsm.c:819 sm/gpgsm.c:822 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, 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:610 agent/gpg-agent.c:1177 g10/gpg.c:2027
-#: scd/scdaemon.c:421 sm/gpgsm.c:914 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
 
-#: agent/gpg-agent.c:947 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "eroare la creearea `%s': %s\n"
 
-#: agent/gpg-agent.c:1247 agent/gpg-agent.c:1373 agent/gpg-agent.c:1377
-#: agent/gpg-agent.c:1418 agent/gpg-agent.c:1422 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:908
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
+#: agent/gpg-agent.c:1321
+#, c-format
+msgid "socket name `%s' is too long\n"
+msgstr ""
+
+#: agent/gpg-agent.c:1333
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
+#, fuzzy
+msgid "error getting nonce for the socket\n"
+msgstr "eroare la ob�inere noului PIN: %s\n"
+
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "director `%s' creat\n"
 
-#: agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1448
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) a e�uat �n %s: %s\n"
 
-#: agent/gpg-agent.c:1438
+#: agent/gpg-agent.c:1452
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: nu pot crea director: %s\n"
 
-#: agent/gpg-agent.c:1549
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
+#, fuzzy, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "eroare la citire `%s': %s\n"
+
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1554
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1571
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1576
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "actualizarea secretului a e�uat: %s\n"
 
-#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: s�rit�: %s\n"
 
-#: agent/gpg-agent.c:1809
+#: agent/gpg-agent.c:1850
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:756
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
 
-#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
-#: tools/gpg-connect-agent.c:767
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent versiune protocol %d nu este suportat\n"
@@ -534,25 +566,25 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1188
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1191
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/protect-tool.c:1216
+#: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1221
+#: agent/protect-tool.c:1199
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
@@ -560,17 +592,17 @@ msgid ""
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "fraz�-parol� incorect�"
 
-#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "anulat�"
@@ -682,7 +714,8 @@ msgstr "schimb� fraza-parol�"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1338
+#: tools/gpgconf-comp.c:1641
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
@@ -830,75 +863,80 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:366
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr "armur�: %s\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr "header armur� invalid: "
 
-#: g10/armor.c:416
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr "header armur�: "
 
-#: g10/armor.c:427
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr "header clearsig invalid\n"
 
-#: g10/armor.c:479
+#: g10/armor.c:455
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "header armur�: "
+
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr "semn�turi text �n clar �ncuib�rite\n"
 
-#: g10/armor.c:614
+#: g10/armor.c:643
 msgid "unexpected armor: "
 msgstr "armur� nea�teptat�: "
 
-#: g10/armor.c:626
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr "linie cu liniu�� escape invalid�: "
 
-#: g10/armor.c:780 g10/armor.c:1390
+#: g10/armor.c:809 g10/armor.c:1419
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caracter radix64 invalid %02X s�rit\n"
 
-#: g10/armor.c:823
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematur (nici un CRC)\n"
 
-#: g10/armor.c:857
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematur (�n CRC)\n"
 
-#: g10/armor.c:865
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr "CRC anormal\n"
 
-#: g10/armor.c:869 g10/armor.c:1427
+#: g10/armor.c:898 g10/armor.c:1456
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "eroare CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:889
+#: g10/armor.c:918
 msgid "premature eof (in trailer)\n"
 msgstr "eof prematur (�n trailer)\n"
 
-#: g10/armor.c:893
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr "eroare linia de trailer\n"
 
-#: g10/armor.c:1204
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr "nici o dat� OpenPGP valid� g�sit�.\n"
 
-#: g10/armor.c:1209
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armur� invalid�: linie mai lung� de %d caractere\n"
 
-#: g10/armor.c:1213
+#: g10/armor.c:1242
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1218,11 +1256,11 @@ msgstr "Nu sunt permise comenzi administrare\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 
-#: g10/decrypt.c:110 g10/encode.c:890
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr "--output nu merge pentru aceast� comand�\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nu pot deschide `%s'\n"
@@ -1233,7 +1271,7 @@ msgstr "nu pot deschide `%s'\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "cheia \"%s\" nu a fost g�sit�: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1275,7 +1313,7 @@ msgstr ""
 "folosi�i op�iunea \"--delete-secret-keys\" pentru a o �terge pe aceasta mai "
 "�nt�i.\n"
 
-#: g10/encode.c:226 g10/sign.c:1296
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
@@ -1294,7 +1332,7 @@ msgstr "folosesc cifrul %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' deja compresat\n"
 
-#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISMENT: `%s' este un fi�ier gol\n"
@@ -1323,7 +1361,7 @@ msgstr ""
 "AVERTISMENT: for��nd cifrul simetric %s (%d) viola�i preferin�ele "
 "destinatarului\n"
 
-#: g10/encode.c:669 g10/sign.c:966
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1332,17 +1370,17 @@ msgstr ""
 "AVERTISMENT: for��nd algoritmul de compresie %s (%d) viola�i preferin�ele "
 "destinatarului\n"
 
-#: g10/encode.c:765
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "for��nd cifrul simetric %s (%d) viola�i preferin�ele destinatarului\n"
 
-#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "nu pute�i folosi %s c�t� vreme �n modul %s\n"
 
-#: g10/encode.c:862
+#: g10/encode.c:848
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrat pentru: \"%s\"\n"
@@ -1525,7 +1563,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:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1533,132 +1571,132 @@ msgstr ""
 "@Comenzi:\n"
 " "
 
-#: g10/gpg.c:370
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[fi�ier]|creaz� o semn�tur�"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
 
-#: g10/gpg.c:372 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "creaz� o semn�tur� deta�at�"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "cifreaz� datele"
 
-#: g10/gpg.c:375 sm/gpgsm.c:248
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr "cifreaz� numai cu cifru simetric"
 
-#: g10/gpg.c:377 sm/gpgsm.c:249
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "decripteaz� datele (implicit)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "verific� o semn�tur�"
 
-#: g10/gpg.c:381 sm/gpgsm.c:252
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "enumer� chei"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "enumer� chei �i semn�turi"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "list and check key signatures"
 msgstr "enumer� �i verific� semn�turile cheii"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "enumer� chei �i amprente"
 
-#: g10/gpg.c:386 sm/gpgsm.c:254
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "enumer� chei secrete"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "genereaz� o nou� perechi de chei"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "remove keys from the public keyring"
 msgstr "�terge chei de pe inelul de chei public"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "remove keys from the secret keyring"
 msgstr "�terge chei de pe inelul de chei secret"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "semneaz� o cheie"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "semneaz� o cheie local"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "semneaz� sau editeaz� o cheie"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "genereaz� un certificat de revocare"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "export� chei"
 
-#: g10/gpg.c:397 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "export� chei pentru un server de chei"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "import� chei de la un server de chei"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:402
 msgid "search for keys on a key server"
 msgstr "caut� pentru chei pe un server de chei"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "update all keys from a keyserver"
 msgstr "actualizeaz� toate cheile de la un server de chei"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "import�/combin� chei"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr "afi�eaz� starea cardului"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr "schimb� data de pe card"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr "schimb� PIN-ul unui card"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr "actualizeaz� baza de date de �ncredere"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
 
-#: g10/gpg.c:430 sm/gpgsm.c:264
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1668,47 +1706,48 @@ msgstr ""
 "Op�iuni:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:281
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr "creaz� ie�ire �n armur� ascii"
 
-#: g10/gpg.c:436 sm/gpgsm.c:293
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: g10/gpg.c:447 sm/gpgsm.c:331
+#: g10/gpg.c:449 sm/gpgsm.c:333
 msgid "use this user-id to sign or decrypt"
 msgstr "folose�te acest id-utilizator pentru a semna sau decripta"
 
-#: g10/gpg.c:448 sm/gpgsm.c:334
+#: g10/gpg.c:450 sm/gpgsm.c:336
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|seteaz� nivel de compresie N (0 deactiveaz�)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:336
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr "folose�te modul text canonic"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
-msgid "use as output file"
-msgstr "folose�te ca fi�ier ie�ire"
+#: g10/gpg.c:469 sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "nu face nici o schimbare"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "�ntreab� �nainte de a suprascrie"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr "folose�te comportament strict OpenPGP"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr "genereaz� mesaje compatibile cu PGP 2.x"
 
-#: g10/gpg.c:553 sm/gpgsm.c:397
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1716,7 +1755,7 @@ msgstr ""
 "@\n"
 "(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:400
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1736,15 +1775,15 @@ msgstr ""
 " --list-keys [nume]         arat� chei\n"
 " --fingerprint [nume]       arat� amprente\n"
 
-#: g10/gpg.c:750 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Raporta�i bug-uri la <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:767
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1754,7 +1793,7 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:578
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1762,77 +1801,81 @@ msgstr ""
 "\n"
 "Algoritmuri suportate:\n"
 
-#: g10/gpg.c:784
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Cifru: "
 
-#: g10/gpg.c:798
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:805 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Compresie: "
 
-#: g10/gpg.c:875
+#: g10/gpg.c:817 sm/gpgsm.c:603
+msgid "Used libraries:"
+msgstr ""
+
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:715
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "comenzi �n conflict\n"
 
-#: g10/gpg.c:1063
+#: g10/gpg.c:1113
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "nu am g�sit nici un semn = �n defini�ia grupului `%s'\n"
 
-#: g10/gpg.c:1260
+#: g10/gpg.c:1310
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigur� (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1263
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigur� (unsafe) pentru fi�ier configurare `%s'\n"
 
-#: g10/gpg.c:1266
+#: g10/gpg.c:1316
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1272
+#: g10/gpg.c:1322
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1325
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru fi�ier configurare `%s'\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1328
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1284
+#: g10/gpg.c:1334
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1337
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1840,21 +1883,21 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1340
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1296
+#: g10/gpg.c:1346
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1349
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1862,471 +1905,471 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1352
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1445
+#: g10/gpg.c:1495
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1594
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1602
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1610
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "arat� c�ruia dintre inelele de chei �i apar�ine o cheie enumerat�"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1612
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1825
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1981
+#: g10/gpg.c:2030
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
 
-#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
 
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2493
+#: g10/gpg.c:2565
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nu este un set de carectere valid\n"
 
 #
-#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/gpg.c:2528
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2603
 msgid "invalid keyserver options\n"
 msgstr "op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2610
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op�iuni import invalide\n"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2613
 msgid "invalid import options\n"
 msgstr "op�iuni import invalide\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2620
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/gpg.c:2551
+#: g10/gpg.c:2623
 msgid "invalid export options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2630
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2561
+#: g10/gpg.c:2633
 msgid "invalid list options\n"
 msgstr "op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2645
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2653
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2655
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2659
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2670
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2673
 msgid "invalid verify options\n"
 msgstr "op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execu�ie ca %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2855
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1298
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2975
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nu va rula cu memorie neprotejat� (insecure) pentru c� %s\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "pute�i crea doar semn�turi deta�ate sau �n clar c�t� vreme sunte�i �n modul "
 "--pgp2\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "nu pute�i semna �i cifra �n acela�i timp c�t� vreme sunte�i �n modul --pgp2\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "trebuie s� folosi�i fi�iere (�i nu un pipe) c�nd lucra�i cu modul --pgp2 "
 "activat.\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:3014
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1370
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1378
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3092
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3098
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3117
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth trebuie s� fie �n intervalul de la 1 la 255\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3119
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3121
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mod S2K invalid; trebuie s� fie 0, 1 sau 3\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3135
 msgid "invalid default preferences\n"
 msgstr "preferin�e implicite invalide\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3144
 msgid "invalid personal cipher preferences\n"
 msgstr "preferin�e cifrare personale invalide\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3148
 msgid "invalid personal digest preferences\n"
 msgstr "preferin�e rezumat personale invalide\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3152
 msgid "invalid personal compress preferences\n"
 msgstr "preferin�e compresie personale invalide\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3185
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge �nc� cu %s!\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3232
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algoritmul de cifrare `%s' c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3237
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algorimul de rezumat `%s' c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3242
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algoritmul de compresie `%s' c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISMENT: destinatari (-r) furniza�i f�r� a folosi cifrare cu cheie "
 "public�\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [nume_fi�ier]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3375
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "cifrarea simetric� a lui `%s' a e�uat: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3398
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nu pute�i folosi --symmetric --encrypt cu --s2k-mode 0\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nu pute�i folosi --symmetric --encrypt c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--sign [nume_fi�ier]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3449
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nu pute�i folosi --symmetric --sign --encrypt cu --s2k-mode 0\n"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3454
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nu pute�i folosi --symmetric --sign --encrypt c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3474
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nume_fi�ier]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizator"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizator"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizator [comenzi]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recep�ie server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3630
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie e�uat: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3641
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "c�utare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3651
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[nume_fi�ier]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4233
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4235
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4268
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
@@ -2338,7 +2381,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:75 sm/gpgsm.c:372
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrie informa�ii de stare �n acest FD"
 
@@ -2887,13 +2930,13 @@ msgstr "cheia %s: cheie nou� - s�rit�\n"
 msgid "no writable keyring found: %s\n"
 msgstr "n-am g�sit nici un inel de chei ce poate fi scris: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scriu �n `%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2369 g10/import.c:2391
+#: g10/import.c:2381 g10/import.c:2403
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
@@ -2982,7 +3025,7 @@ msgstr "cheia %s: cheie secret� cu cifru invalid %d - s�rit�\n"
 msgid "importing secret keys not allowed\n"
 msgstr "importul de chei secrete nu este permis\n"
 
-#: g10/import.c:1158 g10/import.c:2384
+#: g10/import.c:1158 g10/import.c:2396
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nici un inel de chei secrete implicit: %s\n"
@@ -3105,42 +3148,42 @@ msgstr "cheia %s: semn�tur� subcheie �ntr-un loc gre�it - s�rit�\n"
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "cheia %s: clas� de semn�tur� nea�teptat� (0x%02X) - s�rit�\n"
 
-#: g10/import.c:1732
+#: g10/import.c:1744
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "cheia %s: am detectat un ID utilizator duplicat - combinate\n"
 
-#: g10/import.c:1794
+#: g10/import.c:1806
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVERTISMENT: cheia %s poate fi revocat�: aduc revocarea cheii %s\n"
 
-#: g10/import.c:1808
+#: g10/import.c:1820
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVERTISMENT: cheia %s poate fi revocat�: cheia de revocare %s nu este "
 "prezent�.\n"
 
-#: g10/import.c:1867
+#: g10/import.c:1879
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "cheia %s: am ad�ugat certificatul de revocare \"%s\"\n"
 
-#: g10/import.c:1901
+#: g10/import.c:1913
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "cheia %s: am ad�ugat semn�tura de cheie direct�\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2302
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "NOT�: S/N-ul unei chei nu se potrive�te cu cel al cardului\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2310
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "NOT�: cheia primar� este online �i stocat� pe card\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2312
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "NOT�: cheia secundar� este online �i stocat� pe card\n"
 
@@ -3444,7 +3487,7 @@ msgid "Really sign? (y/N) "
 msgstr "Dori�i cu adev�rat s� semna�i? (d/N) "
 
 #: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:348
+#: g10/keyedit.c:5019 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "semnarea a e�uat: %s\n"
@@ -3785,8 +3828,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i aceast� subcheie? (d/N) "
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "�ncrederea proprietar nu poate fi setat� c�nd este folosit� o baz� de date "
 "de �ncredere furnizat� de utilizator\n"
@@ -4653,7 +4695,7 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "Generarea cheii a e�uat: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:273
+#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4661,7 +4703,7 @@ msgstr ""
 "cheia a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:275
+#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5257,17 +5299,17 @@ msgstr "Necompresat"
 msgid "uncompressed|none"
 msgstr "necompresat|niciunul"
 
-#: g10/misc.c:874
+#: g10/misc.c:891
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "acest mesaj s-ar putea s� nu poat� fi folosit de %s\n"
 
-#: g10/misc.c:1049
+#: g10/misc.c:1066
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "op�iune ambigu� `%s'\n"
 
-#: g10/misc.c:1074
+#: g10/misc.c:1091
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "op�iune necunoscut� `%s'\n"
@@ -5326,12 +5368,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpachetul de tip %d are bitul critic setat\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:603
+#: g10/passphrase.c:295 g10/passphrase.c:581
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cheie principal� %s)"
 
-#: g10/passphrase.c:327
+#: g10/passphrase.c:309
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5343,24 +5385,24 @@ msgstr ""
 "\"%.*s\"\n"
 "cheia %u-bit %s, ID %s, creat� %s%s\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:334
 msgid "Repeat passphrase\n"
 msgstr "Repeta�i fraza-parol�\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:336
 msgid "Enter passphrase\n"
 msgstr "Introduce�i fraza-parol�\n"
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:363
 msgid "cancelled by user\n"
 msgstr "anulat� de utilizator\n"
 
-#: g10/passphrase.c:384 g10/passphrase.c:450
+#: g10/passphrase.c:369 g10/passphrase.c:428
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
 
-#: g10/passphrase.c:582
+#: g10/passphrase.c:560
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5369,12 +5411,12 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a descuia cheia secret� pentru\n"
 "utilizator: \"%s\"\n"
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:568
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "cheia %u-bit %s, ID %s, creat� %s"
 
-#: g10/passphrase.c:599
+#: g10/passphrase.c:577
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (subcheie pe cheia principal� ID %s)"
@@ -6009,30 +6051,13 @@ msgstr "cheia %s: nici o subcheie pentru semn�tura de revocare a subcheii\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "cheia %s: nici o subcheie pentru semn�tura legat� de subcheie\n"
 
-#: g10/sign.c:82
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "nu pot pune date notare �n semn�turi v3 (stil PGP 2.x)\n"
-
-#: g10/sign.c:90
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "nu pot pune date notare �n semn�turi de chei v3 (stil PGP 2.x)\n"
-
-#: g10/sign.c:104
+#: g10/sign.c:89
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVERTISMENT: nu pot %%-expanda notarea (prea mare).  Folosesc neexpandat.\n"
 
-#: g10/sign.c:121
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "nu pot pune un URL de politic� �n semn�turi v3 (stil PGP 2.x)\n"
-
-#: g10/sign.c:129
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
-"nu pot pune un URL de politic� �n semn�turi de chei v3 (stil PGP 2.x)\n"
-
-#: g10/sign.c:142
+#: g10/sign.c:115
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6040,7 +6065,7 @@ msgstr ""
 "AVERTISMENT: nu pot %%-expanda URL-ul de politici (prea mare).  �l folosesc "
 "neexpandat.\n"
 
-#: g10/sign.c:170
+#: g10/sign.c:138
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6049,21 +6074,21 @@ msgstr ""
 "AVERTISMENT: nu pot %%-expanda URL-ul serverului de chei (prea mare).  �l "
 "folosesc neexpandat.\n"
 
-#: g10/sign.c:343
+#: g10/sign.c:311
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "verificarea semn�turii create a e�uat: %s\n"
 
-#: g10/sign.c:352
+#: g10/sign.c:320
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s semn�tur� de la: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "pute�i semna-data�at cu chei stil PGP 2.x numai �n modul --pgp2\n"
 
-#: g10/sign.c:864
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6071,15 +6096,15 @@ msgstr ""
 "AVERTISMENT: for�area algoritmului rezumat %s (%d) violeaz� preferin�ele "
 "destinatarului\n"
 
-#: g10/sign.c:991
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "semnare:"
 
-#: g10/sign.c:1106
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "pute�i semna-�n-clar cu chei stil PGP 2.x �n modul --pgp2\n"
 
-#: g10/sign.c:1290
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "va fi folosit� cifrarea %s\n"
@@ -6781,64 +6806,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:114 sm/gpgsm.c:361
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 #, fuzzy
 msgid "read options from file"
 msgstr "citesc op�iuni din `%s'\n"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NUME|folose�te NUME ca destinatar implicit"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NUME|folose�te NUME ca destinatar implicit"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "nu folosi deloc terminalul"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:135
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "arat� comenzi administrare"
 
-#: scd/scdaemon.c:209
+#: scd/scdaemon.c:210
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: scd/scdaemon.c:211
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:658
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1006
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1011
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6872,11 +6897,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1631
+#: sm/certchain.c:195 sm/certchain.c:1646
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1631
+#: sm/certchain.c:196 sm/certchain.c:1646
 #, fuzzy
 msgid "shell"
 msgstr "ajutor"
@@ -6917,8 +6942,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "am e�uat s� stochez cheia: %s\n"
@@ -7087,7 +7112,7 @@ msgstr ""
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1730
+#: sm/certchain.c:1462 sm/certchain.c:1745
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "preferin�a `%s' duplicat�\n"
@@ -7102,11 +7127,11 @@ msgstr "Certificat de revocare creat.\n"
 msgid "root certificate is good\n"
 msgstr "certificat incorect"
 
-#: sm/certchain.c:1620
+#: sm/certchain.c:1635
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1629
+#: sm/certchain.c:1644
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7121,7 +7146,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7135,25 +7160,25 @@ msgstr "nu"
 msgid "[none]"
 msgstr "[nesetat(�)]"
 
-#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
+#: sm/certdump.c:583 sm/certdump.c:628 sm/certdump.c:693 sm/certdump.c:746
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "Eroare: r�spuns invalid.\n"
 
-#: sm/certdump.c:558 sm/certdump.c:603
+#: sm/certdump.c:591 sm/certdump.c:636
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:640 sm/certdump.c:696
+#: sm/certdump.c:673 sm/certdump.c:729
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:665 sm/certdump.c:719
+#: sm/certdump.c:698 sm/certdump.c:752
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "Eroare: r�spuns invalid.\n"
 
-#: sm/certdump.c:936
+#: sm/certdump.c:946
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7281,182 +7306,191 @@ msgstr "stergere keyblock a e�uat: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(Nici o descriere dat�)\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[fi�ier]|creaz� o semn�tur�"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
 #, 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:255
 #, fuzzy
 msgid "list external keys"
 msgstr "enumer� chei secrete"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
 #, fuzzy
 msgid "list certificate chain"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "�terge chei de pe inelul de chei public"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "import certificates"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "export certificates"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "register a smartcard"
 msgstr "adaug� o cheie la un smartcard"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:270
 #, fuzzy
 msgid "change a passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "creaz� ie�ire �n armur� ascii"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NUME|folose�te NUME ca destinatar implicit"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "use the default key as default recipient"
 msgstr "folose�te cheia implicit� ca destinatar implicit"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr "nu folosi deloc terminalul"
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:345
+msgid "|FILE|write a server mode log to FILE"
+msgstr ""
+
+#: sm/gpgsm.c:347
+#, fuzzy
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
+
+#: sm/gpgsm.c:349
 msgid "force v3 signatures"
 msgstr "for�eaz� semn�turi v3"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr "folose�te �ntotdeauna un MDC pentru cifrare"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr "modul batch: nu �ntreba niciodat�"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr "presupune da la cele mai multe �ntreb�ri"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr "presupune nu la cele mai multe �ntreb�ri"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:359
 msgid "add this keyring to the list of keyrings"
 msgstr "adaug� acest inel de chei la lista inelelor de chei"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:360
 msgid "add this secret keyring to the list"
 msgstr "adaug� acest inel de chei secret la list�"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NUME|folose�te NUME ca cheie secret� implicit�"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|folose�te acest server de chei pentru a c�uta chei"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:363
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NUME|seteaz� charset-ul pentru terminal ca NUME"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:379
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:388
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NUME|folose�te algoritm cifrare NUME"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:390
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NUME|folose�te algoritm rezumat mesaj NUME"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:392
 msgid "|N|use compress algorithm N"
 msgstr "|N|folose�te algoritm compresie N"
 
-#: sm/gpgsm.c:568
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: sm/gpgsm.c:571
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7467,36 +7501,36 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: sm/gpgsm.c:650
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: sm/gpgsm.c:748
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "nu m� pot conecta la `%s': %s\n"
 
-#: sm/gpgsm.c:759
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "op�iune necunoscut� `%s'\n"
 
-#: sm/gpgsm.c:1315
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1411
+#: sm/gpgsm.c:1468
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1429
+#: sm/gpgsm.c:1486
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nu pot accesa `%s': %s\n"
 
-#: sm/gpgsm.c:1612
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7519,7 +7553,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "eroare la ob�inerea num�rului serial: %s\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:1274
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "eroare la citire `%s': %s\n"
@@ -7582,17 +7616,17 @@ msgstr "eroare la citire `%s': %s\n"
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:111
+#: sm/qualified.c:105
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "Eroare: amprent� formatat� invalid.\n"
 
-#: sm/qualified.c:129
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:225
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7603,13 +7637,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234 sm/verify.c:536
+#: sm/qualified.c:209 sm/verify.c:580
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:327
+#: sm/qualified.c:277
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7622,292 +7656,310 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "verificarea semn�turii create a e�uat: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:424
 #, fuzzy
 msgid "Signature made "
 msgstr "Semn�tur� f�cut� %s\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:428
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:429
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "eroare la ob�inerea num�rului serial: %s\n"
 
-#: sm/verify.c:514
+#: sm/verify.c:558
 #, fuzzy
 msgid "Good signature from"
 msgstr "Semn�tur� bun� din \"%s\""
 
-#: sm/verify.c:515
+#: sm/verify.c:559
 #, fuzzy
 msgid "                aka"
 msgstr "                aka \"%s\""
 
-#: sm/verify.c:533
+#: sm/verify.c:577
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "Aceasta va fi o auto-semn�tur�.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "termin�"
 
-#: tools/gpg-connect-agent.c:60
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:127
+#: tools/gpg-connect-agent.c:74
+#, fuzzy
+msgid "|FILE|run commands from FILE on startup"
+msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
+
+#: tools/gpg-connect-agent.c:75
+msgid "run /subst on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:174
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: tools/gpg-connect-agent.c:130
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:314
+#: tools/gpg-connect-agent.c:1155
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:323
+#: tools/gpg-connect-agent.c:1164
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:381
+#: tools/gpg-connect-agent.c:1219 tools/gpg-connect-agent.c:1645
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "citirea cheii publice a e�uat: %s\n"
+
+#: tools/gpg-connect-agent.c:1299
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "linie prea lung�"
 
-#: tools/gpg-connect-agent.c:385
+#: tools/gpg-connect-agent.c:1303
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:1619
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "op�iune necunoscut� `%s'\n"
 
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:1637
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "semnarea a e�uat: %s\n"
 
-#: tools/gpg-connect-agent.c:473
-#, fuzzy, c-format
-msgid "receiving line failed: %s\n"
-msgstr "citirea cheii publice a e�uat: %s\n"
-
-#: tools/gpg-connect-agent.c:789
+#: tools/gpg-connect-agent.c:1986
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:798
+#: tools/gpg-connect-agent.c:1995
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
-#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
+#: tools/gpgconf-comp.c:459 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:773
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:796
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
-#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
+#: tools/gpgconf-comp.c:482 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:803
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
-#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:487 tools/gpgconf-comp.c:606 tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:729 tools/gpgconf-comp.c:811
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:737
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:504
+#: tools/gpgconf-comp.c:502
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:506
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:512
+#: tools/gpgconf-comp.c:510
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:526
+#: tools/gpgconf-comp.c:524
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:527
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:531
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:535
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:539
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:543
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|folose�te modul fraz�-parol� N"
 
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:547
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:710
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:669
 msgid "Configuration for Keyservers"
 msgstr ""
 
 #
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:674
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:719
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NUME|folose�te algoritm cifrare NUME pentru fraza-parol�"
 
-#: tools/gpgconf-comp.c:744
+#: tools/gpgconf-comp.c:742
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:786
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:824
+#: tools/gpgconf-comp.c:822
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:834
+#: tools/gpgconf-comp.c:832
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:845
+#: tools/gpgconf-comp.c:843
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:850
+#: tools/gpgconf-comp.c:848
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:887
+#: tools/gpgconf-comp.c:885
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2982
+#: tools/gpgconf-comp.c:3006
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:59
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
+#, fuzzy
+msgid "list global configuration file"
+msgstr "articol configurare necunoscut `%s'\n"
+
+#: tools/gpgconf.c:67
 #, fuzzy
 msgid "check global configuration file"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:71
+msgid "use as output file"
+msgstr "folose�te ca fi�ier ie�ire"
+
+#: tools/gpgconf.c:75
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:100
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:176 tools/gpgconf.c:209
+#: tools/gpgconf.c:202 tools/gpgconf.c:240
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: tools/gpgconf.c:178
+#: tools/gpgconf.c:204
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:187
+#: tools/gpgconf.c:213
 #, fuzzy
 msgid "Component not found"
 msgstr "cheia public� nu a fost g�sit�"
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:242
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Nu sunt permise comenzi administrare\n"
@@ -8001,92 +8053,105 @@ msgstr "eroare la citire `%s': %s\n"
 msgid "error closing %s: %s\n"
 msgstr "eroare �n `%s': %s\n"
 
-#: tools/symcryptrun.c:515
+#: tools/symcryptrun.c:486
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "nu este suportat� execu�ia nici unui program la distan��\n"
 
-#: tools/symcryptrun.c:521
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:556
+#: tools/symcryptrun.c:527
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: tools/symcryptrun.c:563
+#: tools/symcryptrun.c:534
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: tools/symcryptrun.c:579
+#: tools/symcryptrun.c:550
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:578
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: tools/symcryptrun.c:636
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "stergere keyblock a e�uat: %s\n"
 
-#: tools/symcryptrun.c:653
+#: tools/symcryptrun.c:624
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: tools/symcryptrun.c:705
+#: tools/symcryptrun.c:676
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: tools/symcryptrun.c:757
+#: tools/symcryptrun.c:728
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: tools/symcryptrun.c:771
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:826
+#: tools/symcryptrun.c:797
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "nu pot deschide fi�ierul: %s\n"
 
-#: tools/symcryptrun.c:839
+#: tools/symcryptrun.c:810
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "nu pot crea fi�ier de rezerv� `%s': %s\n"
 
-#: tools/symcryptrun.c:1014
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1041
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1050
+#: tools/symcryptrun.c:1021
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "algoritm rezumat %d nu este suportat\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "nu pot pune date notare �n semn�turi v3 (stil PGP 2.x)\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr "nu pot pune date notare �n semn�turi de chei v3 (stil PGP 2.x)\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "nu pot pune un URL de politic� �n semn�turi v3 (stil PGP 2.x)\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr ""
+#~ "nu pot pune un URL de politic� �n semn�turi de chei v3 (stil PGP 2.x)\n"
+
 #, fuzzy
 #~ msgid "shelll"
 #~ msgstr "ajutor"
diff --git a/po/ru.po b/po/ru.po
index 9d48bf0d1..4bf485d6f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 2.0.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-09-14 13:27+0200\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
 "PO-Revision-Date: 2006-11-07 19:31+0300\n"
 "Last-Translator: Maxim Britov <maxim.britov@gmail.com>\n"
 "Language-Team: Russian <gnupg-ru@gnupg.org>\n"
@@ -16,53 +16,70 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr ""
 
-#: agent/call-pinentry.c:438
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr "Введите PIN-код для получения доступа к закрытому ключу"
 
-#: agent/call-pinentry.c:441
+#: agent/call-pinentry.c:551
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Введите фразу-пароль для доступа к закрытому ключу"
 
-#: agent/call-pinentry.c:489
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+#, fuzzy
+msgid "Quality:"
+msgstr "достоверность: %s"
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 msgid "PIN too long"
 msgstr "PIN слишком длинен"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:668
 msgid "Passphrase too long"
 msgstr "фраза-пароль слишком длинная"
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:676
 msgid "Invalid characters in PIN"
 msgstr "Недопустимый символ в PIN-коде"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr "PIN-код слишком короткий"
 
-#: agent/call-pinentry.c:535
+#: agent/call-pinentry.c:693
 msgid "Bad PIN"
 msgstr "плохой PIN"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:694
 msgid "Bad Passphrase"
 msgstr "Неверная фраза-пароль"
 
-#: agent/call-pinentry.c:572
+#: agent/call-pinentry.c:730
 msgid "Passphrase"
 msgstr "Фраза-пароль"
 
@@ -71,21 +88,21 @@ msgstr "Фраза-пароль"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "не поддерживаются ssh ключи превышающие %d бит\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "не могу создать `%s': %s\n"
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
-#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1865
-#: sm/gpgsm.c:1902 sm/gpgsm.c:1940 sm/qualified.c:72
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "не могу открыть `%s': %s\n"
@@ -125,7 +142,12 @@ msgstr "сбой записи ключа: %s\n"
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Введите фразу-пароль для ssh ключа%0A  %c"
 
-#: agent/command-ssh.c:2349
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
+msgid "Please re-enter this passphrase"
+msgstr "Повторно введите фразу-пароль:"
+
+#: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
@@ -134,7 +156,12 @@ msgstr ""
 "Введите фразу-пароль для защиты принятого закрытого ключа%%0A   %s%%0Aвнутри "
 "хранилища ключей gpg-agent"
 
-#: agent/command-ssh.c:2850
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
+msgid "does not match - try again"
+msgstr "не совпало, попробуйте еще раз"
+
+#: agent/command-ssh.c:2885
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "сбой создания потока из сокета: %s\n"
@@ -177,72 +204,63 @@ msgstr "Введите фразу-пароль\n"
 msgid "Take this one anyway"
 msgstr "Всё равно использовать данный ключ? (y/N)"
 
-#: agent/genkey.c:185
+#: agent/genkey.c:191
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u character long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u characters long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:202
+#: agent/genkey.c:212
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digit or special character."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digits or special characters."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:225
+#: agent/genkey.c:235
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
-"passphrase may not%0Abe a known term or match certain pattern."
+"Warning: You have entered an insecure passphrase.%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:238
+#: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:240
+#: agent/genkey.c:253
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:246
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:290
+#: agent/genkey.c:306
 #, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr "Введите фразу-пароль%0Aдля защиты нового ключа"
 
-#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
-msgid "Please re-enter this passphrase"
-msgstr "Повторно введите фразу-пароль:"
-
-#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
-#: tools/symcryptrun.c:456
-msgid "does not match - try again"
-msgstr "не совпало, попробуйте еще раз"
-
-#: agent/genkey.c:412
+#: agent/genkey.c:429
 msgid "Please enter the new passphrase"
 msgstr "Введите новую фразу-пароль"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:104
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 msgid ""
 "@Options:\n"
 " "
@@ -250,63 +268,62 @@ msgstr ""
 "@Параметры:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr "запуск в режиме сервера (foreground)"
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:109
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr "запуск в режиме демона (background)"
 
-#: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:69 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "подробно"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:341
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "уменьшить количество выводимой информации"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:112
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr "вывод результатов в sh-стиле"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:113
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr "вывод результатов в csh-стиле"
 
-#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|взять параметры из FILE"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr "не отсоединяться от консоли"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr "не перехватывать события мыши и клавиатуры"
 
-#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
-#: tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "использовать файл журнала для сервера"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:134
 msgid "use a standard location for the socket"
 msgstr "стандартное расположение сокета"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|использовать PGM как PIN-Entry"
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM| использовать PGM как SCdaemon"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "do not use the SCdaemon"
 msgstr "не использовать SCdaemon"
 
@@ -342,17 +359,17 @@ msgstr "разрешить эмуляцию ssh-агента"
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FILE|сохранить состояние в файл"
 
-#: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:91 tools/symcryptrun.c:204
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204
 msgid "Please report bugs to <"
 msgstr "О найденных ошибках сообщайте <"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Использование: gpg-agent [параметры] (-h для подсказки)"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -360,131 +377,146 @@ msgstr ""
 "Синтаксис: gpg-agent [параметры] [команда [аргументы]]\n"
 "Управление закрытыми ключами для GnuPG\n"
 
-#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "запрошен недупустимый уровень отладки `%s'\n"
 
-#: agent/gpg-agent.c:512 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:340 sm/gpgsm.c:819 sm/gpgsm.c:822 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, fuzzy, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "libksba слишком устаревшая (требуется %s, имеется %s)\n"
 
-#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
 
-#: agent/gpg-agent.c:610 agent/gpg-agent.c:1177 g10/gpg.c:2027
-#: scd/scdaemon.c:421 sm/gpgsm.c:914 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл конфигурации `%s': %s\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "параметры конфигурации из файла `%s'\n"
 
-#: agent/gpg-agent.c:947 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "ошибка создания `%s': %s\n"
 
-#: agent/gpg-agent.c:1247 agent/gpg-agent.c:1373 agent/gpg-agent.c:1377
-#: agent/gpg-agent.c:1418 agent/gpg-agent.c:1422 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:908
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "не могу создать каталог `%s': %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr "имя сокета слишком длинное\n"
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "не могу создать сокет: %s\n"
 
-#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
+#: agent/gpg-agent.c:1321
+#, fuzzy, c-format
+msgid "socket name `%s' is too long\n"
+msgstr "имя сокета слишком длинное\n"
+
+#: agent/gpg-agent.c:1333
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "нет gpg-agent доступого для данной сессии\n"
 
-#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
+#, fuzzy
+msgid "error getting nonce for the socket\n"
+msgstr "ошибка при получении нового PIN: %s\n"
+
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "ошибка связывния сокета с `%s': %s\n"
 
-#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "слушаем сокет `%s'\n"
 
-#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "создан каталог `%s'\n"
 
-#: agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1448
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1438
+#: agent/gpg-agent.c:1452
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "невозможно использовать `%s' как домашний каталог\n"
 
-#: agent/gpg-agent.c:1549
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
+#, fuzzy, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "ошибка чтения из %s: %s\n"
+
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1554
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1571
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1576
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s: остановлен\n"
 
-#: agent/gpg-agent.c:1809
+#: agent/gpg-agent.c:1850
 msgid "no gpg-agent running in this session\n"
 msgstr "нет gpg-agent доступого для данной сессии\n"
 
-#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:756
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
-#: tools/gpg-connect-agent.c:767
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "протокол gpg-agent версии %d не поддерживается\n"
@@ -515,21 +547,21 @@ msgstr ""
 "Синтаксис: gpg-protect-tool [параметры] [аргументы]\n"
 "Инструмент для работы с закрытыми ключами\n"
 
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1188
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Введите фразу-пароль для доступа к PKCS#12 объекту."
 
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1191
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Введите фразу-пароль для защиты нового PKCS#12 объекта."
 
-#: agent/protect-tool.c:1216
+#: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr "Введите фразу-пароль для защиты импортированных в GnuPG объектов."
 
-#: agent/protect-tool.c:1221
+#: agent/protect-tool.c:1199
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -537,16 +569,16 @@ msgstr ""
 "Введите фразу-пароль или PIN\n"
 "необходимые для выполения данной операции."
 
-#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 msgid "Passphrase:"
 msgstr "Фраза-пароль:"
 
-#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "ошибка запроса ввода фразы-пароля: %s\n"
 
-#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 msgid "cancelled\n"
 msgstr "отменено\n"
 
@@ -660,7 +692,8 @@ msgstr "сменить фразу-пароль"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1338
+#: tools/gpgconf-comp.c:1641
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr ""
@@ -804,75 +837,80 @@ msgstr "выход за безопасный предел памяти при р
 msgid "out of core while allocating %lu bytes"
 msgstr "выход за границы при распределении %lu байтов"
 
-#: g10/armor.c:366
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr "формат ASCII: %s\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr "неправильный заголовок ASCII: "
 
-#: g10/armor.c:416
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr "заголовок ASCII: "
 
-#: g10/armor.c:427
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr "неправильный заголовок прозрачной подписи\n"
 
-#: g10/armor.c:479
+#: g10/armor.c:455
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "заголовок ASCII: "
+
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr "вложенные прозрачные подписи\n"
 
-#: g10/armor.c:614
+#: g10/armor.c:643
 msgid "unexpected armor: "
 msgstr "неожидаемый формат ASCII:"
 
-#: g10/armor.c:626
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr "неправильный отступ из минусов: "
 
-#: g10/armor.c:780 g10/armor.c:1390
+#: g10/armor.c:809 g10/armor.c:1419
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "недопустимый символ radix64 %02X пропущен\n"
 
-#: g10/armor.c:823
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr "преждевременный конец файла (нет CRC)\n"
 
-#: g10/armor.c:857
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr "преждевременный конец файла (в CRC)\n"
 
-#: g10/armor.c:865
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr "поврежденный CRC\n"
 
-#: g10/armor.c:869 g10/armor.c:1427
+#: g10/armor.c:898 g10/armor.c:1456
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "ошибка CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:889
+#: g10/armor.c:918
 msgid "premature eof (in trailer)\n"
 msgstr "преждевременный конец файла (в дополнении)\n"
 
-#: g10/armor.c:893
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr "ошибка в строке дополнения\n"
 
-#: g10/armor.c:1204
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr "не найдено данных формата OpenPGP.\n"
 
-#: g10/armor.c:1209
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "неправильный ASCII формат: строка длиннее %d символов\n"
 
-#: g10/armor.c:1213
+#: g10/armor.c:1242
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1191,11 +1229,11 @@ msgstr "Команды администрирования не разрешен�
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Недопустимая команда  (список команд: \"help\")\n"
 
-#: g10/decrypt.c:110 g10/encode.c:890
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr "--output не работает для данной команды\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "не могу открыть `%s'\n"
@@ -1206,7 +1244,7 @@ msgstr "не могу открыть `%s'\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "ключ \"%s\" не найден: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1248,7 +1286,7 @@ msgstr ""
 "сначала воспользуйтесь \"--delete-secret-keys\" для удаления закрытого "
 "ключа.\n"
 
-#: g10/encode.c:226 g10/sign.c:1296
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "ошибка создания фразы-пароля: %s\n"
@@ -1267,7 +1305,7 @@ msgstr "использутся алгоритм шифрования %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' уже сжат\n"
 
-#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ВНИМАНИЕ: `%s' пустой файл\n"
@@ -1293,24 +1331,24 @@ msgid ""
 msgstr ""
 "ВНИМАНИЕ: использование шифра %s (%d) противоречит предпочтениям получателя\n"
 
-#: g10/encode.c:669 g10/sign.c:966
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "ВНИМАНИЕ: сжатие алгоритмом %s (%d) нарушает предпочтения получателя\n"
 
-#: g10/encode.c:765
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "использование шифра %s (%d) противоречит предпочтениям получателя\n"
 
-#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Нельзя использовать %s в режиме %s\n"
 
-#: g10/encode.c:862
+#: g10/encode.c:848
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s зашифровано для: \"%s\"\n"
@@ -1489,7 +1527,7 @@ msgstr "использую подклключ %s вместо главного �
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "ключ %s: секретный ключ без открытого ключа - пропущен\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1497,132 +1535,132 @@ msgstr ""
 "@Команды:\n"
 " "
 
-#: g10/gpg.c:370
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[файл]|создать подпись к файлу"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[файл]|создать прозрачную подпись к файлу"
 
-#: g10/gpg.c:372 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "создать отделенную подпись"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "зашифровать данные"
 
-#: g10/gpg.c:375 sm/gpgsm.c:248
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr "зашифровать только симметричным шифром"
 
-#: g10/gpg.c:377 sm/gpgsm.c:249
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "расшифровать данные (по умолчанию)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "проверить подпись"
 
-#: g10/gpg.c:381 sm/gpgsm.c:252
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "вывести список ключей"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "вывести список ключей и подписей"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "list and check key signatures"
 msgstr "вывести и проверить подписи ключей"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "вывести список ключей и их отпечатков"
 
-#: g10/gpg.c:386 sm/gpgsm.c:254
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "вывести список секретных ключей"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "создать новую пару ключей"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "remove keys from the public keyring"
 msgstr "удалить ключи из таблицы открытых ключей"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "remove keys from the secret keyring"
 msgstr "удалить ключи из таблицы закрытых ключей"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "подписать ключ"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "подписать ключ локально"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "подписать или редактировать ключ"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "создать сертификат отзыва"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "экспортировать ключи"
 
-#: g10/gpg.c:397 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "экспортировать ключи на сервер ключей"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "импортировать ключи с сервера ключей"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:402
 msgid "search for keys on a key server"
 msgstr "искать ключи на сервере ключей"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "update all keys from a keyserver"
 msgstr "обновить все ключи с сервера ключей"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "импортировать/объединить ключи"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr "показать состояние карты"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr "изменить данные на карте"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr "сменить PIN карты"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr "обновить таблицу доверий"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr "|algo [файлы]|вывести хэши файлов"
 
-#: g10/gpg.c:430 sm/gpgsm.c:264
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr "запуск в режиме сервера"
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1632,47 +1670,48 @@ msgstr ""
 "Параметры:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:281
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr "вывод в ASCII формате"
 
-#: g10/gpg.c:436 sm/gpgsm.c:293
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|зашифровать для получателя NAME"
 
-#: g10/gpg.c:447 sm/gpgsm.c:331
+#: g10/gpg.c:449 sm/gpgsm.c:333
 msgid "use this user-id to sign or decrypt"
 msgstr "использовать данный User ID для подписывания и расшифрования"
 
-#: g10/gpg.c:448 sm/gpgsm.c:334
+#: g10/gpg.c:450 sm/gpgsm.c:336
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|установить уровень сжатия N (0 без сжатия)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:336
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr "использовать канонический текстовый режим"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
-msgid "use as output file"
-msgstr "вывод в указанный файл"
+#: g10/gpg.c:469 sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|взять параметры из FILE"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "не делать никаких изменений"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "спросить перед перезаписью"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr "строго следовать стандарту OpenPGP"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr "создает сообщение совместимым с PGP 2.x"
 
-#: g10/gpg.c:553 sm/gpgsm.c:397
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1680,7 +1719,7 @@ msgstr ""
 "@\n"
 "(См. документацию для более полного ознакомления с командами и параметрами)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:400
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1700,15 +1739,15 @@ msgstr ""
 " --list-keys [имена]        показать ключи\n"
 " --fingerprint [имена]      показать отпечатки\n"
 
-#: g10/gpg.c:750 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "О найденных ошибка сообщайте <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:767
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1718,7 +1757,7 @@ msgstr ""
 "Подписи и их проверка, зашифрование и расшифрование\n"
 "действие по умолчанию зависит от входных данных\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:578
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1726,92 +1765,96 @@ msgstr ""
 "\n"
 "Поддерживаются следующие алгоритмы:\n"
 
-#: g10/gpg.c:784
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr "С открытым ключом: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Симметричные шифры: "
 
-#: g10/gpg.c:798
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr "Хэш-функции: "
 
-#: g10/gpg.c:805 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Алгоритмы сжатия: "
 
-#: g10/gpg.c:875
+#: g10/gpg.c:817 sm/gpgsm.c:603
+msgid "Used libraries:"
+msgstr ""
+
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "использование: gpg [параметры] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:715
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "несовместимые команды\n"
 
-#: g10/gpg.c:1063
+#: g10/gpg.c:1113
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "отсутствует знак = в определении группы `%s'\n"
 
-#: g10/gpg.c:1260
+#: g10/gpg.c:1310
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец домашнего каталога `%s'\n"
 
-#: g10/gpg.c:1263
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла конфигурации `%s'\n"
 
-#: g10/gpg.c:1266
+#: g10/gpg.c:1316
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла модуля расширения `%s'\n"
 
-#: g10/gpg.c:1272
+#: g10/gpg.c:1322
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа у домашнего каталога `%s'\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1325
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа у файла конфигурации `%s'\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1328
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа у файла модуля расширения `%s'\n"
 
-#: g10/gpg.c:1284
+#: g10/gpg.c:1334
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего домашний каталог `%s'\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1337
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего файл конфигурации `%s'\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1340
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего модуль расширения `%s'\n"
 
-#: g10/gpg.c:1296
+#: g10/gpg.c:1346
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа у каталога содержащего домашний каталог "
 "`%s'\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1349
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1819,461 +1862,461 @@ msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа у каталога содержащего файл "
 "конфигурации `%s'\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1352
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа у каталогу содержащего файл модуля "
 "расширения `%s'\n"
 
-#: g10/gpg.c:1445
+#: g10/gpg.c:1495
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "неизвестный параметр в файле конфигурации `%s'\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr "отображать Фото ID при распечатке ключей"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr "показывать ссылку на политики при распечатке подписей"
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1594
 msgid "show all notations during signature listings"
 msgstr "показывать все примечания в списке подписей"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 "показывать добавленные пользователем примечания при распечатке подписей"
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1602
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "показываеть предпочитаемый сервер ключей с списке подписей"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr "показывать действительность Used ID при распечатке ключей"
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr "показывать отозванные и просроченные User ID при распечатке ключей"
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr "показывать отозванные и просроченные ключи при распечатке списка"
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1610
 msgid "show the keyring name in key listings"
 msgstr "печатать имя таблиц ключей в списке ключей"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1612
 msgid "show expiration dates during signature listings"
 msgstr "печатать даты истечения в списке подписей"
 
-#: g10/gpg.c:1825
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libcrypt слишком старой версии (требуется %s, обнаружено %s)\n"
 
-#: g10/gpg.c:1981
+#: g10/gpg.c:2030
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "ЗАМЕЧАНИЕ: старый файл конфигурации по умолчанию `%s' проигнорирован\n"
 
-#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ЗАМЕЧАНИЕ: %s не предназначен для обычного применения!\n"
 
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2493
+#: g10/gpg.c:2565
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' недопустимая таблица символов\n"
 
-#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "не могу проанализировать URL сервера ключей\n"
 
-#: g10/gpg.c:2528
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2603
 msgid "invalid keyserver options\n"
 msgstr "недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2610
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2613
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2620
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2551
+#: g10/gpg.c:2623
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2630
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопустимый список параметров\n"
 
-#: g10/gpg.c:2561
+#: g10/gpg.c:2633
 msgid "invalid list options\n"
 msgstr "недопустимый список параметров\n"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr "показывать Фото ID при проверке подписи"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr "показывать ссылку на политики при проверке подписи"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2645
 msgid "show all notations during signature verification"
 msgstr "показывать все примечания в процессе проверки подписей"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr "показывать добавленные пользователем примечания при проверке подписей"
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2653
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "печатать предпочитаемые серверы ключей при проверке подписей"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2655
 msgid "show user ID validity during signature verification"
 msgstr "печатать действительность UserID при проверке подписей"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "показывать отозванные и просроченные User ID при проверке подписей"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2659
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "показывать отозванные и просроченные User ID при проверке подписей"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2670
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопустимые параметры проверки \n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2673
 msgid "invalid verify options\n"
 msgstr "недопустимые параметры проверки\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2855
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr "недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1298
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти программы!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ВНИМАНИЕ: %s заместит %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не допускается использовать с %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s не имеет смысла совместно с %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2975
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не будет работать с небезопасной памятью из-за %s\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Нельзя одновременно подписать и зашифровать в режиме --pgp2\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Следует использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:3014
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифрования сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1370
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1378
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3092
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран неверный алгоритм сжатия\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3098
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция для сертификации\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3117
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3119
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "недопустимый default-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3121
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ЗАМЕЧАНИЕ: простой режим S2K (0) строго не рекомендуется\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3135
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3144
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые персональные предпочтения шифра\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3148
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые персональные предпочтения хэш-функции\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3152
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3185
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s пока не работает совместно с %s\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3232
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать шифрование `%s' в режиме %s\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3237
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать хэш-функцию `%s' в режиме %s\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3242
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать сжатие `%s' в режиме %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [файл]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [файл]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3375
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "симметричное шифрование `%s' не удалось: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [файл]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3398
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [файл]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "нельзя использовать --symmetric --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--sign [файл]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [файл]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3449
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [файл]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3454
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --sign --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3474
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [файл]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [файл]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [файл]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [команды]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "сбой при отправке на сервер ключей: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "сбой при получении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3630
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "сбой при экспорте ключа: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3641
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "сбой при поиске на сервере ключей: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3651
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "сбой при обновлении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из ASCII формата: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[файл]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr "Набирайте Ваше сообщение ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4233
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL политики сертификации неверен\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4235
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL политики подписи неверен\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4268
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
@@ -2285,7 +2328,7 @@ msgstr "используются ключи из этой таблицы клю�
 msgid "make timestamp conflicts only a warning"
 msgstr "при несоответствии отметки времени - только предупреждением"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:372
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr "|FD|выводить инфромацию в файл с дескриптором FD"
 
@@ -2827,13 +2870,13 @@ msgstr "ключ %s: новый ключ - пропущен\n"
 msgid "no writable keyring found: %s\n"
 msgstr "нет доступной для записи таблицы ключей: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "сохраняю в `%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2369 g10/import.c:2391
+#: g10/import.c:2381 g10/import.c:2403
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "ошибка записи таблицы ключей `%s': %s\n"
@@ -2922,7 +2965,7 @@ msgstr "ключ %s: секретный ключ с недопустимым ш�
 msgid "importing secret keys not allowed\n"
 msgstr "импортирование секретного ключа не позволено\n"
 
-#: g10/import.c:1158 g10/import.c:2384
+#: g10/import.c:1158 g10/import.c:2396
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "нет основной таблицы секретных ключей: %s\n"
@@ -3043,40 +3086,40 @@ msgstr "ключ %s: подпись подключа в неправильном
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "ключ %s: неизвестный класс подписи (0x%02X) - пропущена\n"
 
-#: g10/import.c:1732
+#: g10/import.c:1744
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "ключ %s: обнаружено дублирование User ID - объединены\n"
 
-#: g10/import.c:1794
+#: g10/import.c:1806
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ВНИМАНИЕ: ключ %s возможно отозван: запрашиваю ключ отзыва %s\n"
 
-#: g10/import.c:1808
+#: g10/import.c:1820
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "ВНИМАНИЕ: ключ %s возможно отозван: ключ отзыва %s не получен.\n"
 
-#: g10/import.c:1867
+#: g10/import.c:1879
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "ключ %s: \"%s\" добавлен сертификат отзыва\n"
 
-#: g10/import.c:1901
+#: g10/import.c:1913
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "ключ %s: direct key signature добавлена\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2302
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "ПРЕДУПРЕЖДАЮ: S/N ключа не соответствует S/N ключа на карте\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2310
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ПРЕДУПРЕЖДАЮ: главный ключ готов и сохранен в карте\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2312
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ПРЕДУПРЕЖДАЮ: вторичный ключ готов и сохранен в карте\n"
 
@@ -3377,7 +3420,7 @@ msgid "Really sign? (y/N) "
 msgstr "Действительно подписать? (y/N)"
 
 #: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:348
+#: g10/keyedit.c:5019 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "не удалось подписать: %s\n"
@@ -3709,8 +3752,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Действительно хотите отозвать данный подключ? (y/N)"
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "Невозможно присвоить степень доверия пока используется указанная "
 "пользователем таблица доверий\n"
@@ -4563,14 +4605,14 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "Сбой при создании ключа: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:273
+#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:275
+#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5162,17 +5204,17 @@ msgstr "Без сжатия"
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:874
+#: g10/misc.c:891
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "данное сообщение может быть не пригодно для %s\n"
 
-#: g10/misc.c:1049
+#: g10/misc.c:1066
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "двусмысленный параметр `%s'\n"
 
-#: g10/misc.c:1074
+#: g10/misc.c:1091
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "неизвестный параметр `%s'\n"
@@ -5230,12 +5272,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "подпакет типа %d имеет выставленный критический бит\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:603
+#: g10/passphrase.c:295 g10/passphrase.c:581
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (главный ключ ID %s)"
 
-#: g10/passphrase.c:327
+#: g10/passphrase.c:309
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5246,24 +5288,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-бит %s ключ, ID %s, создан %s%s\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:334
 msgid "Repeat passphrase\n"
 msgstr "Повторите ввод фразы-пароля\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:336
 msgid "Enter passphrase\n"
 msgstr "Введите фразу-пароль\n"
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:363
 msgid "cancelled by user\n"
 msgstr "прервано пользователем\n"
 
-#: g10/passphrase.c:384 g10/passphrase.c:450
+#: g10/passphrase.c:369 g10/passphrase.c:428
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "проблема с агентом: %s\n"
 
-#: g10/passphrase.c:582
+#: g10/passphrase.c:560
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5271,12 +5313,12 @@ msgid ""
 msgstr ""
 "Необходима фраза-пароль для доступа к секретному ключу пользователя: \"%s\"\n"
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:568
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-бит %s ключ, ID %s, создан %s"
 
-#: g10/passphrase.c:599
+#: g10/passphrase.c:577
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (подключ на главном ключе %s)"
@@ -5901,29 +5943,13 @@ msgstr "ключ %s: нет подключа для подключа отзыв�
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "ключ %s: нет подключа для подписи связи подключей\n"
 
-#: g10/sign.c:82
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "невозможно добавить примечение в v3 (PGP 2.x стиля) подпись\n"
-
-#: g10/sign.c:90
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "невозможно добавить примечание в v3 (PGP 2.x стиля) подпись ключа\n"
-
-#: g10/sign.c:104
+#: g10/sign.c:89
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "ВНИМАНИЕ: не могу развернуть %% запись (длинный). Использую неразвернутым.\n"
 
-#: g10/sign.c:121
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "невозможно добавить URL правил в v3 (PGP 2.x стиля) подпись\n"
-
-#: g10/sign.c:129
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr "нельзя ставить URL правил в v3 (PGP 2.x стиля) подписи\n"
-
-#: g10/sign.c:142
+#: g10/sign.c:115
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -5931,7 +5957,7 @@ msgstr ""
 "ВНИМАНИЕ: не могу развернуть %% url правил (длинный). Использую "
 "неразвернутым.\n"
 
-#: g10/sign.c:170
+#: g10/sign.c:138
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -5940,21 +5966,21 @@ msgstr ""
 "ВНИМАНИЕ: невозможно развернуть %% URL предпочитаемого сервера ключей "
 "(слишком длинно). Использую неразвернутым.\n"
 
-#: g10/sign.c:343
+#: g10/sign.c:311
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "сбой проверки созданной подписи: %s\n"
 
-#: g10/sign.c:352
+#: g10/sign.c:320
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s подпись от: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "только отделенная подпись доступна с PGP 2.x ключом в режиме --pgp2\n"
 
-#: g10/sign.c:864
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5962,15 +5988,15 @@ msgstr ""
 "ВНИМАНИЕ: использование хэш-функции %s (%d) нарушает предпочтения "
 "получателя\n"
 
-#: g10/sign.c:991
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "подпись:"
 
-#: g10/sign.c:1106
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "только прозрачная подпись доступна с PGP 2.x ключом в режиме --pgp2\n"
 
-#: g10/sign.c:1290
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "будет использовано %s шифрование\n"
@@ -6673,43 +6699,43 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "нет доступа %s - неработоспособная карта OpenPGP?\n"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:114 sm/gpgsm.c:361
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 msgid "read options from file"
 msgstr "получение параметров конфигурации из файла"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:122
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:123
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:126
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:135
+#: scd/scdaemon.c:132
 msgid "allow the use of admin card commands"
 msgstr "позволить использовать управляющие команды"
 
-#: scd/scdaemon.c:209
+#: scd/scdaemon.c:210
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Использование: scdaemon [параметры] (-h для подсказки)"
 
-#: scd/scdaemon.c:211
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6717,17 +6743,17 @@ msgstr ""
 "Синтаксис: scdaemon [параметры] [команда [аргументы]]\n"
 "Демон смарткарт для GnuPG\n"
 
-#: scd/scdaemon.c:658
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 "Используйте параметр `--daemon' для запуска приложения в фоновом режиме\n"
 
-#: scd/scdaemon.c:1006
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "обработчик fd %d запущен\n"
 
-#: scd/scdaemon.c:1011
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "обработчик fd %d остановлен\n"
@@ -6760,11 +6786,11 @@ msgstr "не могу подсоединиться к dirmngr - пытаемся
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1631
+#: sm/certchain.c:195 sm/certchain.c:1646
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1631
+#: sm/certchain.c:196 sm/certchain.c:1646
 msgid "shell"
 msgstr ""
 
@@ -6803,8 +6829,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr "число совпавших издателей: %d\n"
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
 msgid "failed to allocated keyDB handle\n"
 msgstr ""
 
@@ -6968,7 +6994,7 @@ msgstr "найдено еще одно соответствие CA  сертиф
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "цепочка сертификации длиннее дозволенной CA (%d)"
 
-#: sm/certchain.c:1462 sm/certchain.c:1730
+#: sm/certchain.c:1462 sm/certchain.c:1745
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "цепочка сертификации слишком длинная\n"
@@ -6983,11 +7009,11 @@ msgstr "дупликат сертификата `%s' удален\n"
 msgid "root certificate is good\n"
 msgstr "корневой сертификат не помечен доверяемым"
 
-#: sm/certchain.c:1620
+#: sm/certchain.c:1635
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1629
+#: sm/certchain.c:1644
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7002,7 +7028,7 @@ msgstr "ключ DSA %s использует небезопасный (%u бит
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(это MD2 алгоритм)\n"
 
@@ -7014,23 +7040,23 @@ msgstr "нет"
 msgid "[none]"
 msgstr "[нет]"
 
-#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
+#: sm/certdump.c:583 sm/certdump.c:628 sm/certdump.c:693 sm/certdump.c:746
 msgid "[Error - invalid encoding]"
 msgstr "[Ошибка - недопустимая кодировка]"
 
-#: sm/certdump.c:558 sm/certdump.c:603
+#: sm/certdump.c:591 sm/certdump.c:636
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:640 sm/certdump.c:696
+#: sm/certdump.c:673 sm/certdump.c:729
 msgid "[Error - No name]"
 msgstr "[Ошибка - Нет имени]"
 
-#: sm/certdump.c:665 sm/certdump.c:719
+#: sm/certdump.c:698 sm/certdump.c:752
 msgid "[Error - invalid DN]"
 msgstr "[Ошибка - недопустимый DN]"
 
-#: sm/certdump.c:936
+#: sm/certdump.c:946
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7156,171 +7182,181 @@ msgstr "удаление сертификата \"%s\" неудачно: %s\n"
 msgid "no valid recipients given\n"
 msgstr "не заданы получатели\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:246
 msgid "|[FILE]|make a signature"
 msgstr "|[файл]|создать подпись"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[файл]|создать прозрачную подпись"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 msgid "list external keys"
 msgstr "вывести список внешних ключей"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
 msgid "list certificate chain"
 msgstr "вывести список правил сертификатов"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:260
 msgid "remove key from the public keyring"
 msgstr "удалить ключ из таблицы открытых ключей"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 msgid "import certificates"
 msgstr "импорт сертификатов"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:264
 msgid "export certificates"
 msgstr "экспорт сертификатов"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "register a smartcard"
 msgstr "зарегистрировать смарткарту"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr "передать команду dirmngr"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr "вызываем gpg-protect-tool"
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:270
 msgid "change a passphrase"
 msgstr "сменить фразу-пароль"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
 msgid "create base-64 encoded output"
 msgstr "вывод в BASE64"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr "предполагаем получение в формате PEM"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr "предполагаем получение в формате BASE64"
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr "предполагаем получение в двоичном формате"
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
 msgstr "используем системный dirmngr, если доступен"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr "не сверять с CRL"
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr "проверка действительности используя OCSP"
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr "|N|число включаемых сертификатов"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|взять информацию о политиках из FILE"
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr "не проверять политики сертификата"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr "запросить пропущенных издаталей сертификатов"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|использовать NAME как получателя по умолчанию"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "use the default key as default recipient"
 msgstr "использовать ключ по умолчанию как получателя по умолчанию"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr "не использовать терминал совсем"
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:345
+#, fuzzy
+msgid "|FILE|write a server mode log to FILE"
+msgstr "|FILE|сохранять журнал режима сервера в FILE"
+
+#: sm/gpgsm.c:347
+#, fuzzy
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FILE|сохранять журнал режима сервера в FILE"
+
+#: sm/gpgsm.c:349
 msgid "force v3 signatures"
 msgstr "принудительная подпись v3"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr "всегда использовать MDC для шифрования"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr "пакетный режим: ничего не запрашивать"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr "предполагать Да на большинство вопросов"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr "предполагать Нет на большинство вопросов"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:359
 msgid "add this keyring to the list of keyrings"
 msgstr "добавить данную таблицу ключей в список таблиц ключей"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:360
 msgid "add this secret keyring to the list"
 msgstr "добавить данную таблицу секретных ключей в список"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|использовать NAME как секретный ключ по умолчанию"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|использовать данный сервер ключей для поиска ключей"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:363
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|установить кодировку терминала в NAME"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|установить уровень отладки в LEVEL"
 
-#: sm/gpgsm.c:379
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|загрузить модуль дополнения FILE"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:388
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|использовать алгоритм шифрования NAME"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:390
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|использовать хеш-функцию NAME"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:392
 msgid "|N|use compress algorithm N"
 msgstr "|N|использовать алгоритм сжатия N"
 
-#: sm/gpgsm.c:568
+#: sm/gpgsm.c:573
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Использование: gpgsm [параметры] [файлы] (-h для подсказки)"
 
-#: sm/gpgsm.c:571
+#: sm/gpgsm.c:576
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7331,35 +7367,35 @@ msgstr ""
 "протокол\n"
 "операция по умолчанию зависит от входных данных\n"
 
-#: sm/gpgsm.c:650
+#: sm/gpgsm.c:703
 msgid "usage: gpgsm [options] "
 msgstr "использование: gpgsm [параметры] "
 
-#: sm/gpgsm.c:748
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "не могу зашифровать для `%s': %s\n"
 
-#: sm/gpgsm.c:759
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "неизвестный параметр `%s'\n"
 
-#: sm/gpgsm.c:1315
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr "ВНИМАНИЕ: выполняемся с подделанным системным временем: "
 
-#: sm/gpgsm.c:1411
+#: sm/gpgsm.c:1468
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1429
+#: sm/gpgsm.c:1486
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "невозможно подписать используя `%s': %s\n"
 
-#: sm/gpgsm.c:1612
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr "данная команды всё еще не реализована\n"
 
@@ -7381,7 +7417,7 @@ msgstr "ошибка базовой проверки сертификата - н
 msgid "error importing certificate: %s\n"
 msgstr "ошибка импортирования сертификата: %s\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:1274
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "ошибка чтения ввода: %s\n"
@@ -7443,17 +7479,17 @@ msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 "GPG_TTY не установлено - возможно использование подделанного  умолчания\n"
 
-#: sm/qualified.c:111
+#: sm/qualified.c:105
 #, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "неверное сформатированный отпечаток в `%s', строка %d\n"
 
-#: sm/qualified.c:129
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr "недопустисый код страны в `%s', строка %d\n"
 
-#: sm/qualified.c:225
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7464,7 +7500,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234 sm/verify.c:536
+#: sm/qualified.c:209 sm/verify.c:580
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7472,7 +7508,7 @@ msgstr ""
 "Учтите, что для данной программы официально не одобрено создание и проверка "
 "подобных подписей.\n"
 
-#: sm/qualified.c:327
+#: sm/qualified.c:277
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7485,61 +7521,70 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr ""
 
-#: sm/verify.c:388
+#: sm/verify.c:424
 msgid "Signature made "
 msgstr "Подпись сделана"
 
-#: sm/verify.c:392
+#: sm/verify.c:428
 msgid "[date not given]"
 msgstr "[дата не указана]"
 
-#: sm/verify.c:393
+#: sm/verify.c:429
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "с использованием сертификата ID %08lX\n"
 
-#: sm/verify.c:514
+#: sm/verify.c:558
 msgid "Good signature from"
 msgstr "Действительная подпись от"
 
-#: sm/verify.c:515
+#: sm/verify.c:559
 msgid "                aka"
 msgstr "                aka"
 
-#: sm/verify.c:533
+#: sm/verify.c:577
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "Это будет самоподпись.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
 msgid "quiet"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:60
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:127
+#: tools/gpg-connect-agent.c:74
+#, fuzzy
+msgid "|FILE|run commands from FILE on startup"
+msgstr "|FILE|взять параметры из FILE"
+
+#: tools/gpg-connect-agent.c:75
+msgid "run /subst on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:174
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Использование: gpg-connect-agent [параметры] (-h для подсказки)"
 
-#: tools/gpg-connect-agent.c:130
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -7547,205 +7592,214 @@ msgstr ""
 "Синтаксис: gpg-connect-agent: [параметры]\n"
 "Связывается с запущенным агентом и отcылает команды\n"
 
-#: tools/gpg-connect-agent.c:314
+#: tools/gpg-connect-agent.c:1155
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "параметр \"%s\" требует программы и опциональных аргументов\n"
 
-#: tools/gpg-connect-agent.c:323
+#: tools/gpg-connect-agent.c:1164
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "параметр \"%s\" игнорирован по причине \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:381
+#: tools/gpg-connect-agent.c:1219 tools/gpg-connect-agent.c:1645
+#, c-format
+msgid "receiving line failed: %s\n"
+msgstr "сбой получения строки: %s\n"
+
+#: tools/gpg-connect-agent.c:1299
 msgid "line too long - skipped\n"
 msgstr "строка слишком длинная - пропущено\n"
 
-#: tools/gpg-connect-agent.c:385
+#: tools/gpg-connect-agent.c:1303
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:1619
 #, c-format
 msgid "unknown command `%s'\n"
 msgstr "неизвестная команда `%s'\n"
 
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:1637
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "сбой отправки строки: %s\n"
 
-#: tools/gpg-connect-agent.c:473
-#, c-format
-msgid "receiving line failed: %s\n"
-msgstr "сбой получения строки: %s\n"
-
-#: tools/gpg-connect-agent.c:789
+#: tools/gpg-connect-agent.c:1986
 #, c-format
 msgid "error sending %s command: %s\n"
 msgstr "ошибка отправки %s команды: %s\n"
 
-#: tools/gpg-connect-agent.c:798
+#: tools/gpg-connect-agent.c:1995
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "ошибка отправки стандартных параметров: %s\n"
 
-#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
-#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
+#: tools/gpgconf-comp.c:459 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:773
 msgid "Options controlling the diagnostic output"
 msgstr "Параметры контролирующие вывод диагностики"
 
-#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:796
 msgid "Options controlling the configuration"
 msgstr "Параметры контролирующие конфигурацию"
 
-#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
-#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
+#: tools/gpgconf-comp.c:482 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:803
 msgid "Options useful for debugging"
 msgstr "Параметры полезные для отладки"
 
-#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
-#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:487 tools/gpgconf-comp.c:606 tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:729 tools/gpgconf-comp.c:811
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|сохранять журнал режима сервера в FILE"
 
-#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:737
 msgid "Options controlling the security"
 msgstr "Параметры контролирующие безопасность"
 
-#: tools/gpgconf-comp.c:504
+#: tools/gpgconf-comp.c:502
 #, fuzzy
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|кеш PIN просрочен после N секунд"
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:506
 #, fuzzy
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|кеш PIN просрочен после N секунд"
 
-#: tools/gpgconf-comp.c:512
+#: tools/gpgconf-comp.c:510
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:526
+#: tools/gpgconf-comp.c:524
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:527
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:531
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:535
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:539
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:543
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|кеш PIN просрочен после N секунд"
 
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:547
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "разрешить предустановленную фразу-пароль"
 
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:710
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|зашифровать для получателя NAME"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:669
 msgid "Configuration for Keyservers"
 msgstr "Конфигурация серверов ключей"
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "не могу проанализировать URL сервера ключей\n"
 
-#: tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:674
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:719
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:744
+#: tools/gpgconf-comp.c:742
 msgid "do not check CRLs for root certificates"
 msgstr "не проверять CRLd для корневых сертификатов"
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:786
 msgid "Options controlling the format of the output"
 msgstr "Параметры контрролирующие формат вывода"
 
-#: tools/gpgconf-comp.c:824
+#: tools/gpgconf-comp.c:822
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:834
+#: tools/gpgconf-comp.c:832
 msgid "Configuration for HTTP servers"
 msgstr "Настройки HTTP серверов"
 
-#: tools/gpgconf-comp.c:845
+#: tools/gpgconf-comp.c:843
 msgid "use system's HTTP proxy setting"
 msgstr "использовать системные настройки HTTP проки"
 
-#: tools/gpgconf-comp.c:850
+#: tools/gpgconf-comp.c:848
 msgid "Configuration of LDAP servers to use"
 msgstr "Настройки LDAP серверов"
 
-#: tools/gpgconf-comp.c:887
+#: tools/gpgconf-comp.c:885
 msgid "Configuration for OCSP"
 msgstr "Настройки OCSP"
 
-#: tools/gpgconf-comp.c:2982
+#: tools/gpgconf-comp.c:3006
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
 msgid "list all components"
 msgstr "вывод списка всех компонентов"
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:59
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|list options"
 msgstr "|COMPONENT|вывод списка параметров"
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "|COMPONENT|change options"
 msgstr "|COMPONENT|изменить параметры"
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
+#, fuzzy
+msgid "list global configuration file"
+msgstr "неизвестный параметр в файле конфигурации `%s'\n"
+
+#: tools/gpgconf.c:67
 #, fuzzy
 msgid "check global configuration file"
 msgstr "неизвестный параметр в файле конфигурации `%s'\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:71
+msgid "use as output file"
+msgstr "вывод в указанный файл"
+
+#: tools/gpgconf.c:75
 msgid "activate changes at runtime, if possible"
 msgstr "применить изменения во время исполнения, если возможно"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Использование: gpgconf [параметры] (-h для подсказки)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:100
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
@@ -7753,19 +7807,19 @@ msgstr ""
 "Синтаксис: gpgconf [параметры]\n"
 "Управляет параметрами конфигурации инструментария GnuPG\n"
 
-#: tools/gpgconf.c:176 tools/gpgconf.c:209
+#: tools/gpgconf.c:202 tools/gpgconf.c:240
 msgid "usage: gpgconf [options] "
 msgstr "использование: gpgconf [параметры] "
 
-#: tools/gpgconf.c:178
+#: tools/gpgconf.c:204
 msgid "Need one component argument"
 msgstr "Требуется однокомпонентный аргумент"
 
-#: tools/gpgconf.c:187
+#: tools/gpgconf.c:213
 msgid "Component not found"
 msgstr "Компонент не найден"
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:242
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Команды администрирования не разрешены\n"
@@ -7858,91 +7912,103 @@ msgstr "ошибка чтения из %s: %s\n"
 msgid "error closing %s: %s\n"
 msgstr "ошибка закрытия %s: %s\n"
 
-#: tools/symcryptrun.c:515
+#: tools/symcryptrun.c:486
 msgid "no --program option provided\n"
 msgstr "не задан параметр --program\n"
 
-#: tools/symcryptrun.c:521
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr "поддерживаются только параметры --decrypt и --encrypt\n"
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr "не задан параметр --keyfile\n"
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:556
+#: tools/symcryptrun.c:527
 #, c-format
 msgid "could not create pipe: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:563
+#: tools/symcryptrun.c:534
 #, c-format
 msgid "could not create pty: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:579
+#: tools/symcryptrun.c:550
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:578
 #, c-format
 msgid "execv failed: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:636
+#: tools/symcryptrun.c:607
 #, c-format
 msgid "select failed: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:653
+#: tools/symcryptrun.c:624
 #, c-format
 msgid "read failed: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:705
+#: tools/symcryptrun.c:676
 #, c-format
 msgid "pty read failed: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:757
+#: tools/symcryptrun.c:728
 #, c-format
 msgid "waitpid failed: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:771
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr "потомок завершился, статус %i\n"
 
-#: tools/symcryptrun.c:826
+#: tools/symcryptrun.c:797
 #, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:839
+#: tools/symcryptrun.c:810
 #, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1014
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr "следует задать %s либо %s\n"
 
-#: tools/symcryptrun.c:1041
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr "не задан класс\n"
 
-#: tools/symcryptrun.c:1050
+#: tools/symcryptrun.c:1021
 #, c-format
 msgid "class %s is not supported\n"
 msgstr "класс %s не поддерживается\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "невозможно добавить примечение в v3 (PGP 2.x стиля) подпись\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr "невозможно добавить примечание в v3 (PGP 2.x стиля) подпись ключа\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "невозможно добавить URL правил в v3 (PGP 2.x стиля) подпись\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr "нельзя ставить URL правил в v3 (PGP 2.x стиля) подписи\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
diff --git a/po/sk.po b/po/sk.po
index c60702e73..6cfc98274 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-09-14 13:27+0200\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <mmajer@econ.umb.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -13,59 +13,75 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: agent/call-pinentry.c:438
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:441
+#: agent/call-pinentry.c:551
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: agent/call-pinentry.c:489
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+msgid "Quality:"
+msgstr ""
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 #, fuzzy
 msgid "PIN too long"
 msgstr "riadok je pr�li� dlh�\n"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:668
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "heslo je pr�li� dlh�\n"
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:676
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Neplatn� znak ve mene\n"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:535
+#: agent/call-pinentry.c:693
 #, fuzzy
 msgid "Bad PIN"
 msgstr "nespr�vne MPI"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:694
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "nespr�vne heslo"
 
-#: agent/call-pinentry.c:572
+#: agent/call-pinentry.c:730
 #, fuzzy
 msgid "Passphrase"
 msgstr "nespr�vne heslo"
@@ -75,21 +91,21 @@ msgstr "nespr�vne heslo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
-#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1865
-#: sm/gpgsm.c:1902 sm/gpgsm.c:1940 sm/qualified.c:72
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
@@ -129,14 +145,25 @@ msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: agent/command-ssh.c:2349
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "zmeni� heslo"
+
+#: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2850
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/command-ssh.c:2885
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: nepodarilo sa vytvori� hashovaciu tabu�ku: %s\n"
@@ -181,76 +208,66 @@ msgstr "Vlo�i� heslo\n"
 msgid "Take this one anyway"
 msgstr "Pou�i� napriek tomu tento k���? "
 
-#: agent/genkey.c:185
+#: agent/genkey.c:191
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u character long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u characters long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:202
+#: agent/genkey.c:212
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digit or special character."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digits or special characters."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:225
+#: agent/genkey.c:235
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
-"passphrase may not%0Abe a known term or match certain pattern."
+"Warning: You have entered an insecure passphrase.%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:238
+#: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:240
+#: agent/genkey.c:253
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:246
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:290
+#: agent/genkey.c:306
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Na ochranu V�ho tajn�ho k���a mus�te zada� heslo.\n"
 "\n"
 
-#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "zmeni� heslo"
-
-#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
-#: tools/symcryptrun.c:456
-msgid "does not match - try again"
-msgstr ""
-
-#: agent/genkey.c:412
+#: agent/genkey.c:429
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "zmeni� heslo"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:104
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -260,66 +277,65 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:109
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:69 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "s dodato�n�mi inform�ciami"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:341
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "by� o trochu tich��"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:112
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:113
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
-#: tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "vyh�ada� k���e na serveri k���ov"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:134
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualizova� datab�zu d�very"
@@ -357,152 +373,167 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:91 tools/symcryptrun.c:204
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
 "Chyby ozn�mte, pros�m, na adresu <gnupg-bugs@gnu.org>.\n"
 "Pripomienky k prekladu <sk-i18n@lists.linux.sk>.\n"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:512 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:340 sm/gpgsm.c:819 sm/gpgsm.c:822 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, 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:610 agent/gpg-agent.c:1177 g10/gpg.c:2027
-#: scd/scdaemon.c:421 sm/gpgsm.c:914 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:947 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "chyba pri vytv�ran� `%s': %s\n"
 
-#: agent/gpg-agent.c:1247 agent/gpg-agent.c:1373 agent/gpg-agent.c:1377
-#: agent/gpg-agent.c:1418 agent/gpg-agent.c:1422 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:908
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nem��em vytvori� adres�r `%s': %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
+#: agent/gpg-agent.c:1321
+#, c-format
+msgid "socket name `%s' is too long\n"
+msgstr ""
+
+#: agent/gpg-agent.c:1333
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
+#, fuzzy
+msgid "error getting nonce for the socket\n"
+msgstr "chyba pri vytv�ran� hesla: %s\n"
+
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "chyba pri posielan� na `%s': %s\n"
 
-#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: adres�r vytvoren�\n"
 
-#: agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1448
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "datab�za d�very: proced�ra read() (n=%d) zlyhala: %s\n"
 
-#: agent/gpg-agent.c:1438
+#: agent/gpg-agent.c:1452
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: nem��em vytvori� adres�r: %s\n"
 
-#: agent/gpg-agent.c:1549
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
+#, fuzzy, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "chyba pri ��tan� `%s': %s\n"
+
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1554
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1571
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1576
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
 
-#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: presko�en�: %s\n"
 
-#: agent/gpg-agent.c:1809
+#: agent/gpg-agent.c:1850
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:756
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "zl� form�t premennej prostredia GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
-#: tools/gpg-connect-agent.c:767
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verzie %d nie je podporovan�\n"
@@ -529,40 +560,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1188
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1191
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: agent/protect-tool.c:1216
+#: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1221
+#: agent/protect-tool.c:1199
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "nespr�vne heslo"
 
-#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Zru�i�"
@@ -674,7 +705,8 @@ msgstr "zmeni� heslo"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1338
+#: tools/gpgconf-comp.c:1641
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
@@ -823,77 +855,82 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:366
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII k�dovanie: %s\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr "neplatn� hlavi�ka ASCII k�dovania: "
 
-#: g10/armor.c:416
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr "ASCII hlavi�ka: "
 
-#: g10/armor.c:427
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr "neplatn� hlavi�ka podpisu v �itate�nom form�te\n"
 
-#: g10/armor.c:479
+#: g10/armor.c:455
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "ASCII hlavi�ka: "
+
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr "vnoren� podpisy v �itate�nom form�tu\n"
 
-#: g10/armor.c:614
+#: g10/armor.c:643
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "neo�ak�van� k�dovanie ASCII:"
 
-#: g10/armor.c:626
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr "nespr�vne ozna�enie riadku m�nusmi: "
 
-#: g10/armor.c:780 g10/armor.c:1390
+#: g10/armor.c:809 g10/armor.c:1419
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "neplatn� znak vo form�te radix64 %02x bol presko�en�\n"
 
-#: g10/armor.c:823
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr "pred�asn� koniec s�boru (�iadne CRC)\n"
 
-#: g10/armor.c:857
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr "pred�asn� koniec s�boru (v CRC)\n"
 
-#: g10/armor.c:865
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr "nespr�vny form�t CRC\n"
 
-#: g10/armor.c:869 g10/armor.c:1427
+#: g10/armor.c:898 g10/armor.c:1456
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Chyba CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:889
+#: g10/armor.c:918
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "pred�asn� koniec s�boru (v p�ti�ke)\n"
 
-#: g10/armor.c:893
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr "chyba v p�ti�ke\n"
 
-#: g10/armor.c:1204
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: g10/armor.c:1209
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "neplatn� k�dovanie ASCII: riadok je dlh�� ako %d znakov\n"
 
-#: g10/armor.c:1213
+#: g10/armor.c:1242
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1239,11 +1276,11 @@ msgstr "zapisujem tajn� k��� do `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 
-#: g10/decrypt.c:110 g10/encode.c:890
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento pr�kaz nefunguje\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nemo�no otvori� `%s'\n"
@@ -1254,7 +1291,7 @@ msgstr "nemo�no otvori� `%s'\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1297,7 +1334,7 @@ msgstr "existuje tajn� k��� pre tento verejn� k��� \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby ste ho zmazali, pou�ite najprv prep�na� \"--delete-secret-key\".\n"
 
-#: g10/encode.c:226 g10/sign.c:1296
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
@@ -1316,7 +1353,7 @@ msgstr "pou�it� �ifra %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' je u� skomprimovan�\n"
 
-#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROVANIE: s�bor `%s' je pr�zdny\n"
@@ -1342,7 +1379,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vy�iadan� symetrick� �ifra %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/encode.c:669 g10/sign.c:966
+#: g10/encode.c:655 g10/sign.c:936
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1350,19 +1387,19 @@ msgid ""
 msgstr ""
 "vy�iadan� kompresn� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/encode.c:765
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vy�iadan� symetrick� �ifra %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/encode.c:862
+#: g10/encode.c:848
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s za�ifrovan� pre: %s\n"
@@ -1551,7 +1588,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:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1559,133 +1596,133 @@ msgstr ""
 "@Pr�kazy:\n"
 " "
 
-#: g10/gpg.c:370
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[s�bor]|vytvori� podpis"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
 
-#: g10/gpg.c:372 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "vytvori� podpis oddelen� od dokumentu"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "�ifrova� d�ta"
 
-#: g10/gpg.c:375 sm/gpgsm.c:248
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrovanie len so symetrickou �ifrou"
 
-#: g10/gpg.c:377 sm/gpgsm.c:249
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "de�ifrova� d�ta (implicitne)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "verifikova� podpis"
 
-#: g10/gpg.c:381 sm/gpgsm.c:252
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "vyp�sa� zoznam k���ov"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "vyp�sa� zoznam k���ov a podpisov"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "skontrolova� podpisy k���ov"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "vyp�sa� zoznam k���ov a fingerprintov"
 
-#: g10/gpg.c:386 sm/gpgsm.c:254
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "vyp�sa� zoznam tajn�ch k���ov"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "remove keys from the public keyring"
 msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "remove keys from the secret keyring"
 msgstr "odstr�ni� k��� zo s�boru tajn�ch k���ov"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "podp�sa� k���"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "podp�sa� k��� lok�lne"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "podp�sa� alebo modifikova� k���"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "vytvori� revoka�n� certifik�t"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "exportova� k���e"
 
-#: g10/gpg.c:397 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "exportova� k���e na server k���ov"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "importova� k���e zo servera k���ov"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:402
 msgid "search for keys on a key server"
 msgstr "vyh�ada� k���e na serveri k���ov"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "update all keys from a keyserver"
 msgstr "aktualizova� v�etky k���e zo servera k���ov"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "importova�/zl��i� k���e"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:410
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr "aktualizova� datab�zu d�very"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr "|algo [s�bory]|vyp�� hash"
 
-#: g10/gpg.c:430 sm/gpgsm.c:264
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1695,51 +1732,52 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:281
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
 
-#: g10/gpg.c:436 sm/gpgsm.c:293
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|MENO|�ifrova� pre MENO"
 
-#: g10/gpg.c:447 sm/gpgsm.c:331
+#: g10/gpg.c:449 sm/gpgsm.c:333
 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:448 sm/gpgsm.c:334
+#: g10/gpg.c:450 sm/gpgsm.c:336
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavi� �rove� komprim�cie N (0 - �iadna\n"
 " komprim�cia)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:336
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr "pou�i� k�nonick� textov� m�d"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
-msgid "use as output file"
-msgstr "pou�i� ako v�stupn� s�bor"
+#: g10/gpg.c:469 sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "nevykona� �iadne zmeny"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "vy�iada� potvrdenie pred prep�san�m"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:524
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:397
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1748,7 +1786,7 @@ msgstr ""
 "(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
 "mo�nost�)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:400
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1768,17 +1806,17 @@ msgstr ""
 " --list-keys [men�]        vyp�sa� k���e\n"
 " --fingerprint [men�]      vyp�sa� fingerprinty\n"
 
-#: g10/gpg.c:750 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Chyby ozn�mte, pros�m, na adresu <gnupg-bugs@gnu.org>.\n"
 "Pripomienky k prekladu <sk-i18n@lists.linux.sk>.\n"
 
-#: g10/gpg.c:767
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1788,7 +1826,7 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:578
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1796,565 +1834,569 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/gpg.c:784
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr "Verejn� k���e: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "�ifry: "
 
-#: g10/gpg.c:798
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:805 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Kompresia: "
 
-#: g10/gpg.c:875
+#: g10/gpg.c:817 sm/gpgsm.c:603
+msgid "Used libraries:"
+msgstr ""
+
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:715
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/gpg.c:1063
+#: g10/gpg.c:1113
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = podpis n�jden� v defin�cii skupiny \"%s\"\n"
 
-#: g10/gpg.c:1260
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1263
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1266
+#: g10/gpg.c:1316
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1272
+#: g10/gpg.c:1322
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1325
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1328
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1284
+#: g10/gpg.c:1334
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1337
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1340
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1296
+#: g10/gpg.c:1346
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1349
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1352
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1445
+#: g10/gpg.c:1495
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1594
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1602
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1610
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "uk� v ktorom s�bore k���ov je vyp�san� k���"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1612
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/gpg.c:1825
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1981
+#: g10/gpg.c:2030
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZN�MKA: star� implicitn� s�bor s mo�nos�ami `%s ignorovan�'\n"
 
-#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nie je pre norm�lne pou�itie!\n"
 
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2493
+#: g10/gpg.c:2565
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/gpg.c:2528
+#: g10/gpg.c:2600
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2603
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2610
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2613
 msgid "invalid import options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2620
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2551
+#: g10/gpg.c:2623
 msgid "invalid export options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2630
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2561
+#: g10/gpg.c:2633
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2645
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2653
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2655
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2659
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2670
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2673
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2855
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1298
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prep��e %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�va s %s zmysel!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2975
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytv�ra� len oddelen� podpisy alebo podpisy �itate�n� "
 "ako text\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v m�de --pgp2 nemo�no s��asne �ifrova� a podpisova�\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v m�de --pgp2 mus�te pou�i� s�bor (nie r�ru).\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:3014
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1370
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1378
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3092
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3098
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3117
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "polo�ka max-cert-depth mus� by� v rozmedz� od 1 do 255\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3119
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "neplatn� implicitn� �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3121
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "neplatn� minim�lna �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razne nedoporu�ovan�\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatn� m�d S2K; mus� by� 0, 1 alebo 3\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3135
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� predvo�by\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3144
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3148
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3152
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3185
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s e�te nepracuje s %s\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3232
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� �ifrovac� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3237
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� hashovac� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3242
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� kompresn� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROVANIE: dan� adres�t (-r) bez pou�itia �ifrovania s verejn�m k���om\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [meno s�boru]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno s�boru]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3375
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno s�boru]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3398
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3403
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--sign [meno s�boru]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3449
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3454
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3474
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno s�boru]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno s�boru]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno s�boru]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u��vate�a"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u��vate�a [pr�kazy]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3630
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export k���a: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3641
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa n�js� server: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3651
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualiz�cia servera zlyhala: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[meno s�boru]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite p�sa� svoju spr�vu ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4233
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4235
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4268
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
@@ -2367,7 +2409,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:75 sm/gpgsm.c:372
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zap�sa� inform�cie o stave do tohto FD"
 
@@ -2900,13 +2942,13 @@ msgstr "k��� %08lX: nov� k��� - presko�en�\n"
 msgid "no writable keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor k���ov (keyring): %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisujem do '%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2369 g10/import.c:2391
+#: g10/import.c:2381 g10/import.c:2403
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
@@ -2996,7 +3038,7 @@ msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a %d - presko�en�\n"
 msgid "importing secret keys not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/import.c:1158 g10/import.c:2384
+#: g10/import.c:1158 g10/import.c:2396
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nie je nastaven� implicitn� s�bor tajn�ch k���ov %s\n"
@@ -3120,45 +3162,45 @@ msgstr "k��� %08lX: podpis subk���a na zlom mieste - presko�en� \n"
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "k��� %08lX: neo�ak�van� podpisov� trieda (0x%02X) - presko�en�\n"
 
-#: g10/import.c:1732
+#: g10/import.c:1744
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "k��� %08lX: zisten� duplikovan� identifik�tor u��vate�a - zl��en�\n"
 
-#: g10/import.c:1794
+#: g10/import.c:1806
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROVANIE: k��� %08lX m��e by� revokovan�: sk��am z�ska� revoka�n� k��� %"
 "08lX\n"
 
-#: g10/import.c:1808
+#: g10/import.c:1820
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "VAROVANIE: k��� %08lX m��e by� revokovan�: revoka�n� k��� %08lX nen�jden�.\n"
 
-#: g10/import.c:1867
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "k��� %08lX: pridan� revoka�n� certifik�t \"%s\"\n"
 
-#: g10/import.c:1901
+#: g10/import.c:1913
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "k��� %08lX: podpis k���a n�m sam�m (direct key signature)\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2302
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "verejn� k��� nes�hlas� s tajn�m!\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2310
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2312
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
@@ -3488,7 +3530,7 @@ msgid "Really sign? (y/N) "
 msgstr "Skuto�ne podp�sa�? "
 
 #: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:348
+#: g10/keyedit.c:5019 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
@@ -3851,8 +3893,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Skuto�ne chcete revokova� tento k���? "
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
 #: g10/keyedit.c:2140
@@ -4730,7 +4771,7 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:273
+#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4738,7 +4779,7 @@ msgstr ""
 "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
 "je probl�m so syst�mov�m �asom)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:275
+#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5345,17 +5386,17 @@ msgstr "Nekomprimovan�"
 msgid "uncompressed|none"
 msgstr "Nekomprimovan�"
 
-#: g10/misc.c:874
+#: g10/misc.c:891
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "t�to spr�va nemus� pou�ite�n� s %s\n"
 
-#: g10/misc.c:1049
+#: g10/misc.c:1066
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: g10/misc.c:1074
+#: g10/misc.c:1091
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
@@ -5413,12 +5454,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:603
+#: g10/passphrase.c:295 g10/passphrase.c:581
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hlavn� ID k���a %08lX)"
 
-#: g10/passphrase.c:327
+#: g10/passphrase.c:309
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5429,24 +5470,24 @@ msgstr ""
 "\"%.*s\"\n"
 "k��� s d�kou %u bitov, typ %s, ID %08lX, vytvoren� %s%s\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:334
 msgid "Repeat passphrase\n"
 msgstr "Opakova� heslo\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:336
 msgid "Enter passphrase\n"
 msgstr "Vlo�i� heslo\n"
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:363
 msgid "cancelled by user\n"
 msgstr "zru�en� u��vate�om\n"
 
-#: g10/passphrase.c:384 g10/passphrase.c:450
+#: g10/passphrase.c:369 g10/passphrase.c:428
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "probl�m s agentom: agent vracia 0x%lx\n"
 
-#: g10/passphrase.c:582
+#: g10/passphrase.c:560
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5456,12 +5497,12 @@ msgstr ""
 "Mus�te pozna� heslo, aby ste odomkli tajn� k��� pre\n"
 "u��vate�a: \""
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:568
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�ka %u bitov, typ %s, ID %08lX, vytvoren� %s"
 
-#: g10/passphrase.c:599
+#: g10/passphrase.c:577
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6098,30 +6139,14 @@ msgstr "k��� %08lX: neexistuje podk��� pre revok�ciu k���a\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "k��� %08lX: neexistuje podk��� pre viazanie podk���ov\n"
 
-#: g10/sign.c:82
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "nem��em prida� dodato�n� �daje do v3 (PGP 2.x �t�l) podpisov\n"
-
-#: g10/sign.c:90
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "nem��em prida� dodato�n� �daje do v3 (PGP 2.x �t�l) podpisov k���ov\n"
-
-#: g10/sign.c:104
+#: g10/sign.c:89
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "VAROVANIE: nemo�no %%-expandova� not�cie (pr�li� dlh�). Pou�it� "
 "neexpandovan�.\n"
 
-#: g10/sign.c:121
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "nem��em prida� politiku URL do v3 (PGP 2.x �t�l) podpisov\n"
-
-#: g10/sign.c:129
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr "nem��em prida� politiku URL do v3 (PGP 2.x �t�l) podpisov k���ov\n"
-
-#: g10/sign.c:142
+#: g10/sign.c:115
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6129,7 +6154,7 @@ msgstr ""
 "VAROVANIE: nem��em %%-expandova� URL politiky (pr�li� dlh�). Pou�it� "
 "neexpandovan�.\n"
 
-#: g10/sign.c:170
+#: g10/sign.c:138
 #, fuzzy, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6138,39 +6163,39 @@ msgstr ""
 "VAROVANIE: nem��em %%-expandova� URL politiky (pr�li� dlh�). Pou�it� "
 "neexpandovan�.\n"
 
-#: g10/sign.c:343
+#: g10/sign.c:311
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
 
-#: g10/sign.c:352
+#: g10/sign.c:320
 #, fuzzy, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s podpis od: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytvori� len oddelen� podpis k���a vo form�te PGP-2.x\n"
 
-#: g10/sign.c:864
+#: g10/sign.c:834
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/sign.c:991
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "podpisujem:"
 
-#: g10/sign.c:1106
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytv�ra� �itate�n� podpisy len s k���mi form�tu PGP-2."
 "x\n"
 
-#: g10/sign.c:1290
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�it� �ifrovanie %s\n"
@@ -6887,64 +6912,64 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:114 sm/gpgsm.c:361
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 #, fuzzy
 msgid "read options from file"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:122
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:123
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:126
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "v�bec nepou��va� termin�l"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:135
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "konfliktn� pr�kazy\n"
 
-#: scd/scdaemon.c:209
+#: scd/scdaemon.c:210
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: scd/scdaemon.c:211
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:658
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1006
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1011
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6978,11 +7003,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1631
+#: sm/certchain.c:195 sm/certchain.c:1646
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1631
+#: sm/certchain.c:196 sm/certchain.c:1646
 #, fuzzy
 msgid "shell"
 msgstr "help"
@@ -7023,8 +7048,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
@@ -7192,7 +7217,7 @@ msgstr ""
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1730
+#: sm/certchain.c:1462 sm/certchain.c:1745
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "duplicita predvo�by %c%lu\n"
@@ -7207,11 +7232,11 @@ msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
 msgid "root certificate is good\n"
 msgstr "nespr�vny certifik�t"
 
-#: sm/certchain.c:1620
+#: sm/certchain.c:1635
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1629
+#: sm/certchain.c:1644
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7226,7 +7251,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7240,25 +7265,25 @@ msgstr "nie"
 msgid "[none]"
 msgstr "nezn�me"
 
-#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
+#: sm/certdump.c:583 sm/certdump.c:628 sm/certdump.c:693 sm/certdump.c:746
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: sm/certdump.c:558 sm/certdump.c:603
+#: sm/certdump.c:591 sm/certdump.c:636
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:640 sm/certdump.c:696
+#: sm/certdump.c:673 sm/certdump.c:729
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:665 sm/certdump.c:719
+#: sm/certdump.c:698 sm/certdump.c:752
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: sm/certdump.c:936
+#: sm/certdump.c:946
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7385,187 +7410,196 @@ msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 msgid "no valid recipients given\n"
 msgstr "(�iadny popis)\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[s�bor]|vytvori� podpis"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list external keys"
 msgstr "vyp�sa� zoznam tajn�ch k���ov"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
 #, fuzzy
 msgid "list certificate chain"
 msgstr "nespr�vny certifik�t"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:260
 #, 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:263
 #, fuzzy
 msgid "import certificates"
 msgstr "nespr�vny certifik�t"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "export certificates"
 msgstr "nespr�vny certifik�t"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:270
 #, fuzzy
 msgid "change a passphrase"
 msgstr "zmeni� heslo"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 msgid "|NAME|use NAME as default recipient"
 msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "use the default key as default recipient"
 msgstr ""
 "pou�i� implicitn� k��� ako implicitn�ho\n"
 " adres�ta"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr "v�bec nepou��va� termin�l"
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:345
+msgid "|FILE|write a server mode log to FILE"
+msgstr ""
+
+#: sm/gpgsm.c:347
+#, fuzzy
+msgid "|FILE|write an audit log to FILE"
+msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
+
+#: sm/gpgsm.c:349
 msgid "force v3 signatures"
 msgstr "vyn�ti� podpisy verzie 3"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr "na �ifrovanie v�dy pou�i� MDC"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr "d�vkov� re�im: nikdy sa na ni� nep�ta�"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr "automaticky odpoveda� �no na v��inu ot�zok"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr "automaticky odpoveda� NIE na v��inu ot�zok"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:359
 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:357
+#: sm/gpgsm.c:360
 msgid "add this secret keyring to the list"
 msgstr "prida� tento s�bor tajn�ch k���ov do zoznamu"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|MENO|pou�i MENO ako implicitn� tajn� k���"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
 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:360
+#: sm/gpgsm.c:363
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|MENO|nastav znakov� sadu termin�lu na MENO"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:379
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:388
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ALG|pou�i� �ifrovac� algoritmus ALG"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:390
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|ALG|pou�i� hashovac� algoritmus ALG"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:392
 msgid "|N|use compress algorithm N"
 msgstr "|N|pou�i� kompresn� algoritmus N"
 
-#: sm/gpgsm.c:568
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: sm/gpgsm.c:571
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7576,36 +7610,36 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: sm/gpgsm.c:650
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: sm/gpgsm.c:748
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "nem��em sa pripoji� k `%s': %s\n"
 
-#: sm/gpgsm.c:759
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
 
-#: sm/gpgsm.c:1315
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1411
+#: sm/gpgsm.c:1468
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: sm/gpgsm.c:1429
+#: sm/gpgsm.c:1486
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nem��em zavrie� `%s': %s\n"
 
-#: sm/gpgsm.c:1612
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7628,7 +7662,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:1274
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
@@ -7691,17 +7725,17 @@ msgstr "chyba pri ��tan� `%s': %s\n"
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:111
+#: sm/qualified.c:105
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: sm/qualified.c:129
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:225
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7712,13 +7746,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234 sm/verify.c:536
+#: sm/qualified.c:209 sm/verify.c:580
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:327
+#: sm/qualified.c:277
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7731,293 +7765,311 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:424
 #, fuzzy
 msgid "Signature made "
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:428
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:429
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: sm/verify.c:514
+#: sm/verify.c:558
 #, fuzzy
 msgid "Good signature from"
 msgstr "Dobr� podpis od \""
 
-#: sm/verify.c:515
+#: sm/verify.c:559
 #, fuzzy
 msgid "                aka"
 msgstr "                alias \""
 
-#: sm/verify.c:533
+#: sm/verify.c:577
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr ""
 "\n"
 "Ide o podpis k���a n�m sam�m\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "ukon�i�"
 
-#: tools/gpg-connect-agent.c:60
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:127
+#: tools/gpg-connect-agent.c:74
+#, fuzzy
+msgid "|FILE|run commands from FILE on startup"
+msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
+
+#: tools/gpg-connect-agent.c:75
+msgid "run /subst on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:174
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: tools/gpg-connect-agent.c:130
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:314
+#: tools/gpg-connect-agent.c:1155
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:323
+#: tools/gpg-connect-agent.c:1164
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:381
+#: tools/gpg-connect-agent.c:1219 tools/gpg-connect-agent.c:1645
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+
+#: tools/gpg-connect-agent.c:1299
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "riadok je pr�li� dlh�\n"
 
-#: tools/gpg-connect-agent.c:385
+#: tools/gpg-connect-agent.c:1303
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:1619
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
 
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:1637
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: tools/gpg-connect-agent.c:473
-#, fuzzy, c-format
-msgid "receiving line failed: %s\n"
-msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
-
-#: tools/gpg-connect-agent.c:789
+#: tools/gpg-connect-agent.c:1986
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "chyba pri posielan� na `%s': %s\n"
 
-#: tools/gpg-connect-agent.c:798
+#: tools/gpg-connect-agent.c:1995
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "chyba pri posielan� na `%s': %s\n"
 
-#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
-#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
+#: tools/gpgconf-comp.c:459 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:773
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:796
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
-#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
+#: tools/gpgconf-comp.c:482 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:803
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
-#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:487 tools/gpgconf-comp.c:606 tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:729 tools/gpgconf-comp.c:811
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:737
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:504
+#: tools/gpgconf-comp.c:502
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:506
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:512
+#: tools/gpgconf-comp.c:510
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:526
+#: tools/gpgconf-comp.c:524
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:527
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:531
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:535
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:539
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:543
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|pou�i� m�d hesla N"
 
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:547
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:710
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|MENO|�ifrova� pre MENO"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:669
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:674
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:719
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|ALG|pou�i� �ifrovac� algoritmus ALG pre hesl�"
 
-#: tools/gpgconf-comp.c:744
+#: tools/gpgconf-comp.c:742
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:786
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:824
+#: tools/gpgconf-comp.c:822
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:834
+#: tools/gpgconf-comp.c:832
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:845
+#: tools/gpgconf-comp.c:843
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:850
+#: tools/gpgconf-comp.c:848
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:887
+#: tools/gpgconf-comp.c:885
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2982
+#: tools/gpgconf-comp.c:3006
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:59
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
+#, fuzzy
+msgid "list global configuration file"
+msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
+
+#: tools/gpgconf.c:67
 #, fuzzy
 msgid "check global configuration file"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:71
+msgid "use as output file"
+msgstr "pou�i� ako v�stupn� s�bor"
+
+#: tools/gpgconf.c:75
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:100
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:176 tools/gpgconf.c:209
+#: tools/gpgconf.c:202 tools/gpgconf.c:240
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: tools/gpgconf.c:178
+#: tools/gpgconf.c:204
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:187
+#: tools/gpgconf.c:213
 #, fuzzy
 msgid "Component not found"
 msgstr "verejn� k��� nen�jden�"
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:242
 #, fuzzy
 msgid "No argument allowed"
 msgstr "zapisujem tajn� k��� do `%s'\n"
@@ -8111,92 +8163,105 @@ msgstr "chyba pri ��tan� `%s': %s\n"
 msgid "error closing %s: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: tools/symcryptrun.c:515
+#: tools/symcryptrun.c:486
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "�iadne vzialen� vykon�vanie programu nie je podporovan�\n"
 
-#: tools/symcryptrun.c:521
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:556
+#: tools/symcryptrun.c:527
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: tools/symcryptrun.c:563
+#: tools/symcryptrun.c:534
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: tools/symcryptrun.c:579
+#: tools/symcryptrun.c:550
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:578
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: tools/symcryptrun.c:636
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: tools/symcryptrun.c:653
+#: tools/symcryptrun.c:624
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: tools/symcryptrun.c:705
+#: tools/symcryptrun.c:676
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: tools/symcryptrun.c:757
+#: tools/symcryptrun.c:728
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: tools/symcryptrun.c:771
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:826
+#: tools/symcryptrun.c:797
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: tools/symcryptrun.c:839
+#: tools/symcryptrun.c:810
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: tools/symcryptrun.c:1014
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1041
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1050
+#: tools/symcryptrun.c:1021
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "nem��em prida� dodato�n� �daje do v3 (PGP 2.x �t�l) podpisov\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr ""
+#~ "nem��em prida� dodato�n� �daje do v3 (PGP 2.x �t�l) podpisov k���ov\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "nem��em prida� politiku URL do v3 (PGP 2.x �t�l) podpisov\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr "nem��em prida� politiku URL do v3 (PGP 2.x �t�l) podpisov k���ov\n"
+
 #, fuzzy
 #~ msgid "shelll"
 #~ msgstr "help"
diff --git a/po/sv.po b/po/sv.po
index 238ab1e7b..968d17ad6 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg trunk\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-11-12 20:00+0100\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
 "PO-Revision-Date: 2007-11-12 16:08+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -33,12 +33,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "misslyckades med att ta kontroll över PIN-inmatningslåset: %s\n"
 
-#: agent/call-pinentry.c:538
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -46,44 +46,61 @@ msgstr ""
 "Ange din PIN-kod så att den hemliga nyckeln kan låsas upp för den här "
 "sessionen"
 
-#: agent/call-pinentry.c:541
+#: agent/call-pinentry.c:551
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 "Ange din lösenfras så att den hemliga nyckeln kan låsas upp för denna session"
 
-#: agent/call-pinentry.c:599
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+#, fuzzy
+msgid "Quality:"
+msgstr "giltighet: %s"
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (försök %d av %d)"
 
-#: agent/call-pinentry.c:619 agent/call-pinentry.c:631
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 msgid "PIN too long"
 msgstr "PIN-koden är för lång"
 
-#: agent/call-pinentry.c:620
+#: agent/call-pinentry.c:668
 msgid "Passphrase too long"
 msgstr "Lösenfrasen är för lång"
 
-#: agent/call-pinentry.c:628
+#: agent/call-pinentry.c:676
 msgid "Invalid characters in PIN"
 msgstr "Ogiltiga tecken i PIN-kod"
 
-#: agent/call-pinentry.c:633
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr "PIN-kod för kort"
 
 # MPI står för Multiple Precision Integer (tror jag)
-#: agent/call-pinentry.c:645
+#: agent/call-pinentry.c:693
 msgid "Bad PIN"
 msgstr "Felaktig PIN-kod"
 
-#: agent/call-pinentry.c:646
+#: agent/call-pinentry.c:694
 msgid "Bad Passphrase"
 msgstr "Felaktig lösenfras"
 
-#: agent/call-pinentry.c:682
+#: agent/call-pinentry.c:730
 msgid "Passphrase"
 msgstr "Lösenfras"
 
@@ -94,7 +111,7 @@ msgstr "Lösenfras"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh-nycklar större än %d bitar stöds inte\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1057 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, c-format
@@ -103,12 +120,12 @@ msgstr "kan inte skapa \"%s\": %s\n"
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1058 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1936
-#: sm/gpgsm.c:1973 sm/gpgsm.c:2011 sm/qualified.c:66
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
@@ -167,7 +184,7 @@ msgstr ""
 msgid "does not match - try again"
 msgstr "stämmer inte överens - försök igen"
 
-#: agent/command-ssh.c:2881
+#: agent/command-ssh.c:2885
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "misslyckades med att skapa flöde från uttag: %s\n"
@@ -277,7 +294,7 @@ msgid "Please enter the new passphrase"
 msgstr "Ange den nya lösenfrasen"
 
 # Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
-#: agent/gpg-agent.c:116 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:101
 msgid ""
 "@Options:\n"
@@ -286,109 +303,109 @@ msgstr ""
 "@Flaggor:\n"
 " "
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:103
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr "kör i serverläge (förgrund)"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr "kör i demonläge (bakgrund)"
 
-#: agent/gpg-agent.c:120 g10/gpg.c:470 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:341 tools/gpg-connect-agent.c:66
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "utförlig"
 
-#: agent/gpg-agent.c:121 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:342
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "var något tystare"
 
-#: agent/gpg-agent.c:122 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr "sh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:123 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr "csh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:124 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|läs inställningar från FIL"
 
-#: agent/gpg-agent.c:129 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr "frigör inte från konsollen"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr "fånga inte tangentbord och mus"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "använd en loggfil för servern"
 
-#: agent/gpg-agent.c:133
+#: agent/gpg-agent.c:134
 msgid "use a standard location for the socket"
 msgstr "använd en standardplats för uttaget"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PRG|använd PRG som PIN-inmatningsprogrammet"
 
-#: agent/gpg-agent.c:139
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PRG|använd PRG som SCdaemon-programmet"
 
-#: agent/gpg-agent.c:140
+#: agent/gpg-agent.c:141
 msgid "do not use the SCdaemon"
 msgstr "använd inte SCdaemon"
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr "ignorera begäran om att ändra TTY"
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr "ignorera begäran om att ändra X-display"
 
-#: agent/gpg-agent.c:153
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|låt mellanlagrade PIN-koder gå ut efter N sekunder"
 
-#: agent/gpg-agent.c:166
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr "använd inte mellanlagring av PIN-kod vid signering"
 
 # Antar att värdet inte ska översättas.
-#: agent/gpg-agent.c:168
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "tillåt klienter att markera nycklar som \"trusted\""
 
-#: agent/gpg-agent.c:170
+#: agent/gpg-agent.c:172
 msgid "allow presetting passphrase"
 msgstr "tillåt förinställning av lösenfras"
 
-#: agent/gpg-agent.c:171
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr "aktivera ssh-agent-emulering"
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FIL|skriv miljöinställningar även till FIL"
 
-#: agent/gpg-agent.c:279 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:568 tools/gpg-connect-agent.c:171
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
 #: tools/gpgconf.c:94 tools/symcryptrun.c:204
 msgid "Please report bugs to <"
 msgstr "Rapportera fel till <"
 
-#: agent/gpg-agent.c:282
+#: agent/gpg-agent.c:285
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Användning: gpg-agent [flaggor] (-h för hjälp)"
 
-#: agent/gpg-agent.c:284
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -396,144 +413,144 @@ msgstr ""
 "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
 "Hantering av hemliga nycklar för GnuPG\n"
 
-#: agent/gpg-agent.c:319 g10/gpg.c:964 scd/scdaemon.c:247 sm/gpgsm.c:730
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ogiltig debug-level \"%s\" angiven\n"
 
-#: agent/gpg-agent.c:518 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:871 sm/gpgsm.c:874 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s är för gammal (behöver %s, har %s)\n"
 
-#: agent/gpg-agent.c:611 g10/gpg.c:2070 scd/scdaemon.c:423 sm/gpgsm.c:962
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBS: inställningsfilen \"%s\" saknas\n"
 
-#: agent/gpg-agent.c:616 agent/gpg-agent.c:1183 g10/gpg.c:2074
-#: scd/scdaemon.c:428 sm/gpgsm.c:966 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: agent/gpg-agent.c:624 g10/gpg.c:2081 scd/scdaemon.c:436 sm/gpgsm.c:973
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: agent/gpg-agent.c:955 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Fel när \"%s\" skapades: %s\n"
 
-#: agent/gpg-agent.c:1253 agent/gpg-agent.c:1365 agent/gpg-agent.c:1369
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1414 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:917
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan inte skapa katalog: %s\n"
 
-#: agent/gpg-agent.c:1267 scd/scdaemon.c:931
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr "namnet på uttaget är för långt\n"
 
-#: agent/gpg-agent.c:1290 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan inte skapa uttag: %s\n"
 
-#: agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1321
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "namnet på uttaget \"%s\" är för långt\n"
 
-#: agent/gpg-agent.c:1311
+#: agent/gpg-agent.c:1333
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "en gpg-agent är redan igång - startar inte en till\n"
 
 # Jag har valt att inte översätta nonce. Nonce är data eller information som endast används en gång
-#: agent/gpg-agent.c:1322 scd/scdaemon.c:974
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
 msgid "error getting nonce for the socket\n"
 msgstr "fel vid hämtning av nonce för uttaget\n"
 
-#: agent/gpg-agent.c:1327 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "fel när \"%s\" bands till uttag: %s\n"
 
-#: agent/gpg-agent.c:1339 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() misslyckades: %s\n"
 
-#: agent/gpg-agent.c:1345 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "lyssnar på uttaget \"%s\"\n"
 
-#: agent/gpg-agent.c:1373 agent/gpg-agent.c:1420 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen \"%s\" skapades\n"
 
-#: agent/gpg-agent.c:1426
+#: agent/gpg-agent.c:1448
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() misslyckades för \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1430
+#: agent/gpg-agent.c:1452
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "kan inte använda \"%s\" som hemkatalog\n"
 
-#: agent/gpg-agent.c:1540 scd/scdaemon.c:1006
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "fel vid läsning av nonce på fd %d: %s\n"
 
-#: agent/gpg-agent.c:1562
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "hanteraren 0x%lx för fd %d startad\n"
 
-#: agent/gpg-agent.c:1567
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "hanteraren 0x%lx för fd %d avslutad\n"
 
-#: agent/gpg-agent.c:1587
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh-hanteraren 0x%lx för fd %d startad\n"
 
-#: agent/gpg-agent.c:1592
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh-hanteraren 0x%lx för fd %d avslutad\n"
 
-#: agent/gpg-agent.c:1696 scd/scdaemon.c:1128
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select misslyckades: %s - väntar 1 s\n"
 
-#: agent/gpg-agent.c:1805 scd/scdaemon.c:1195
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppad\n"
 
-#: agent/gpg-agent.c:1828
+#: agent/gpg-agent.c:1850
 msgid "no gpg-agent running in this session\n"
 msgstr "ingen gpg-agent kör i den här sessionen\n"
 
-#: agent/gpg-agent.c:1839 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
 
-#: agent/gpg-agent.c:1852 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -1264,7 +1281,7 @@ msgid "--output doesn't work for this command\n"
 msgstr "--output kan inte användas för detta kommando\n"
 
 # se förra kommentaren
-#: g10/decrypt.c:166 g10/gpg.c:3928 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
@@ -1564,7 +1581,7 @@ msgstr "använder undernyckeln %s istället för primära nyckeln %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "nyckel %s: hemlig nyckel utan publik nyckel - hoppades över\n"
 
-#: g10/gpg.c:369 kbx/kbxutil.c:71 sm/gpgsm.c:243 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1572,133 +1589,133 @@ msgstr ""
 "@Kommandon:\n"
 " "
 
-#: g10/gpg.c:371
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartextsignatur"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "skapa signatur i en separat fil"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr "kryptering endast med symmetriskt chiffer"
 
 # gnupg dekrypterar data om inget kommando anges dvs. kommandot "decrypt" behöver inte användas.
-#: g10/gpg.c:378 sm/gpgsm.c:250
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "dekryptera data (standard)"
 
-#: g10/gpg.c:380 sm/gpgsm.c:251
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "validera en signatur"
 
-#: g10/gpg.c:382 sm/gpgsm.c:253
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "lista nycklar"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "lista nycklar och signaturer"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list and check key signatures"
 msgstr "lista och kontrollera nyckelsignaturer"
 
-#: g10/gpg.c:386 sm/gpgsm.c:257
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "lista nycklar och fingeravtryck"
 
-#: g10/gpg.c:387 sm/gpgsm.c:255
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "lista hemliga nycklar"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "remove keys from the public keyring"
 msgstr "ta bort nycklar från den publika nyckelringen"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "remove keys from the secret keyring"
 msgstr "ta bort nycklar från den hemliga nyckelringen"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "generera ett spärrcertifikat"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/gpg.c:399 sm/gpgsm.c:261
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "importera nycklar från en nyckelserver"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "search for keys on a key server"
 msgstr "sök efter nycklar hos en nyckelserver"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:404
 msgid "update all keys from a keyserver"
 msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "importera/slå samman nycklar"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr "skriv ut kortstatus"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr "ändra data på ett kort"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr "ändra PIN-kod för ett kort"
 
-#: g10/gpg.c:421
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/gpg.c:428
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
-#: g10/gpg.c:431 sm/gpgsm.c:265
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr "kör i serverläge"
 
 # Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
-#: g10/gpg.c:433 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:280
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1709,50 +1726,50 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: g10/gpg.c:435 sm/gpgsm.c:282
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/gpg.c:437 sm/gpgsm.c:294
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera för NAMN"
 
-#: g10/gpg.c:448 sm/gpgsm.c:332
+#: g10/gpg.c:449 sm/gpgsm.c:333
 msgid "use this user-id to sign or decrypt"
 msgstr "använd denna användaridentitet för att signera eller dekryptera"
 
-#: g10/gpg.c:449 sm/gpgsm.c:335
+#: g10/gpg.c:450 sm/gpgsm.c:336
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|ställ in komprimeringsnivån till N (0 för att inaktivera)"
 
-#: g10/gpg.c:454 sm/gpgsm.c:337
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: g10/gpg.c:468 sm/gpgsm.c:340
+#: g10/gpg.c:469 sm/gpgsm.c:341
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FIL|läs inställningar från FIL"
 
-#: g10/gpg.c:481 kbx/kbxutil.c:90 sm/gpgsm.c:351 tools/gpgconf.c:74
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "fråga innan överskrivning"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr "använd strikt OpenPGP-beteende"
 
-#: g10/gpg.c:526
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr "generera PGP 2.x-kompatibla meddelanden"
 
 # inställningar istället för flaggor?
 # Nej, här är det bruksanvisningen för kommandoraden.
-#: g10/gpg.c:555 sm/gpgsm.c:399
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1760,7 +1777,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
 
-#: g10/gpg.c:558 sm/gpgsm.c:402
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1780,18 +1797,18 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/gpg.c:753 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Rapportera fel till <gnupg-bugs@gnu.org>\n"
 "Skicka synpunkter på översättningen till <tp-sv@listor.tp-sv.se>\n"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
 # Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: g10/gpg.c:773
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1801,7 +1818,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: g10/gpg.c:784 sm/gpgsm.c:581
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1809,78 +1826,78 @@ msgstr ""
 "\n"
 "Algoritmer som stöds:\n"
 
-#: g10/gpg.c:787
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr "Publik nyckel: "
 
-#: g10/gpg.c:794 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Chiffer: "
 
-#: g10/gpg.c:801
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: g10/gpg.c:808 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:815 sm/gpgsm.c:601
+#: g10/gpg.c:817 sm/gpgsm.c:603
 msgid "Used libraries:"
 msgstr "Använda bibliotek:"
 
-#: g10/gpg.c:923
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: g10/gpg.c:1093 sm/gpgsm.c:766
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
 # Vad betyder detta?
-#: g10/gpg.c:1111
+#: g10/gpg.c:1113
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
 
-#: g10/gpg.c:1308
+#: g10/gpg.c:1310
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VARNING: osäkert ägarskap på hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VARNING: osäkert ägarskap på konfigurationsfilen \"%s\"\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1316
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VARNING: osäkert ägarskap på tillägget \"%s\"\n"
 
-#: g10/gpg.c:1320
+#: g10/gpg.c:1322
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VARNING: osäkra rättigheter på hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1323
+#: g10/gpg.c:1325
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VARNING: osäkra rättigheter på konfigurationsfilen \"%s\"\n"
 
 # Extension är vad? FIXME
-#: g10/gpg.c:1326
+#: g10/gpg.c:1328
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VARNING: osäkra rättigheter på tillägget \"%s\"\n"
 
-#: g10/gpg.c:1332
+#: g10/gpg.c:1334
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1335
+#: g10/gpg.c:1337
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1888,19 +1905,19 @@ msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen \"%"
 "s\"\n"
 
-#: g10/gpg.c:1338
+#: g10/gpg.c:1340
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för tillägget \"%s\"\n"
 
-#: g10/gpg.c:1344
+#: g10/gpg.c:1346
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1347
+#: g10/gpg.c:1349
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1908,470 +1925,470 @@ msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen "
 "\"%s\"\n"
 
-#: g10/gpg.c:1350
+#: g10/gpg.c:1352
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för tillägget \"%s\"\n"
 
-#: g10/gpg.c:1493
+#: g10/gpg.c:1495
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "okänd konfigurationspost \"%s\"\n"
 
-#: g10/gpg.c:1588
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr "visa foto-id under nyckellistning"
 
-#: g10/gpg.c:1590
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr "visa policy-url:er under signaturlistningar"
 
-#: g10/gpg.c:1592
+#: g10/gpg.c:1594
 msgid "show all notations during signature listings"
 msgstr "visa alla notationer under signaturlistningar"
 
-#: g10/gpg.c:1594
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr "visa IETF-standardnotationer under signaturlistningar"
 
-#: g10/gpg.c:1598
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr "visa användarangivna notationer under signaturlistningar"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1602
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "visa url:er till föredragna nyckelservrar under signaturlistningar"
 
-#: g10/gpg.c:1602
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr "visa giltighet för användaridentitet vid nyckellistningar "
 
-#: g10/gpg.c:1604
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
 
-#: g10/gpg.c:1606
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
 
-#: g10/gpg.c:1608
+#: g10/gpg.c:1610
 msgid "show the keyring name in key listings"
 msgstr "visa nyckelringens namn i nyckellistningar"
 
-#: g10/gpg.c:1610
+#: g10/gpg.c:1612
 msgid "show expiration dates during signature listings"
 msgstr "visa utgångsdatum under signaturlistningar"
 
-#: g10/gpg.c:1873
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt är för gammalt (behöver %s, har %s)\n"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2030
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
 
-#: g10/gpg.c:2288 g10/gpg.c:2952 g10/gpg.c:2964
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "OBS: %s är inte för normal användning!\n"
 
-#: g10/gpg.c:2469 g10/gpg.c:2481
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "\"%s\" är inte ett giltigt utgångsdatum för en signatur\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2565
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "\"%s\" är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2586 g10/gpg.c:2781 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka url till nyckelserver\n"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2603
 msgid "invalid keyserver options\n"
 msgstr "ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2610
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ogiltiga importeringsflaggor\n"
 
-#: g10/gpg.c:2611
+#: g10/gpg.c:2613
 msgid "invalid import options\n"
 msgstr "ogiltiga importflaggor\n"
 
-#: g10/gpg.c:2618
+#: g10/gpg.c:2620
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ogiltiga exportflaggor\n"
 
-#: g10/gpg.c:2621
+#: g10/gpg.c:2623
 msgid "invalid export options\n"
 msgstr "ogiltiga exportinställningar\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2630
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ogiltiga listflaggor\n"
 
-#: g10/gpg.c:2631
+#: g10/gpg.c:2633
 msgid "invalid list options\n"
 msgstr "ogiltiga listflaggor\n"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr "visa foto-id under signaturvalidering"
 
-#: g10/gpg.c:2641
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr "visa policy-url:er under signaturvalidering"
 
-#: g10/gpg.c:2643
+#: g10/gpg.c:2645
 msgid "show all notations during signature verification"
 msgstr "visa alla notationer under signaturvalidering"
 
-#: g10/gpg.c:2645
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr "visa IETF-standardnotationer under signaturvalidering"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr "visa användarangivna notationer under signaturvalidering"
 
-#: g10/gpg.c:2651
+#: g10/gpg.c:2653
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
 
-#: g10/gpg.c:2653
+#: g10/gpg.c:2655
 msgid "show user ID validity during signature verification"
 msgstr "visa giltighet för användaridentitet vid signaturvalidering"
 
-#: g10/gpg.c:2655
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2659
 msgid "show only the primary user ID in signature verification"
 msgstr "visa endast primär användaridentitet i signaturvalidering"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr "validera signaturer med PKA-data"
 
-#: g10/gpg.c:2661
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "öka tillit på signaturer med giltigt PKA-data"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2670
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2673
 msgid "invalid verify options\n"
 msgstr "ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunde inte ställa in exec-path till %s\n"
 
-#: g10/gpg.c:2852
+#: g10/gpg.c:2855
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
 
-#: g10/gpg.c:2855
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr "ogiltig auto-key-locate-lista\n"
 
 # Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
-#: g10/gpg.c:2941 sm/gpgsm.c:1352
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
 
-#: g10/gpg.c:2945
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/gpg.c:2957
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "det är ingen poäng att använda %s tillsammans med %s!\n"
 
-#: g10/gpg.c:2972
+#: g10/gpg.c:2975
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kommer inte att köra med osäkert minne på grund av %s\n"
 
-#: g10/gpg.c:2986
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "du kan bara göra signaturer i en separat fil eller klartextsignaturer\n"
 "i --pgp2-läge\n"
 
-#: g10/gpg.c:2992
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "du kan inte signera och kryptera samtidigt i --pgp2-läge\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "du måste använda filer (och inte rör) i --pgp2-läge\n"
 
 # IDEA-algoritmen är patenterat i flera länder och finns därför inte med i GnuPG som standard.
-#: g10/gpg.c:3011
+#: g10/gpg.c:3014
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "kryptering av meddelanden i --pgp2-läge kräver IDEA-chiffret\n"
 
-#: g10/gpg.c:3077 g10/gpg.c:3101 sm/gpgsm.c:1424
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: g10/gpg.c:3083 g10/gpg.c:3107 sm/gpgsm.c:1432
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr "vald sammandragsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3089
+#: g10/gpg.c:3092
 msgid "selected compression algorithm is invalid\n"
 msgstr "vald komprimeringsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3095
+#: g10/gpg.c:3098
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vald algoritm för certifieringssammandrag är felaktig\n"
 
 # antalet betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/gpg.c:3110
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr "variabeln \"completes-needed\" måste ha ett värde som är större än 0\n"
 
 # antalet delvis betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/gpg.c:3112
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" måste vara större än 1\n"
 
 # Hur djupt GnuPG ska leta i Web-of-trust.
-#: g10/gpg.c:3114
+#: g10/gpg.c:3117
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth måste vara inom intervallet från 1 till 255\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:3116
+#: g10/gpg.c:3119
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "ogiltigt standardvärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:3118
+#: g10/gpg.c:3121
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ogiltigt minimivärde för certifieringsnivån; måste vara 1, 2 eller 3\n"
 
 # S2K har med krypteringen av hemliga nyckeln att göra
-#: g10/gpg.c:3121
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/gpg.c:3125
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ogiltigt S2K-läge; måste vara 0, 1 eller 3\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3135
 msgid "invalid default preferences\n"
 msgstr "ogiltiga standardinställningar\n"
 
 # Du kan ange de algoritmer du föredrar i prioritetsordning. Då avgör inte enbart standard (symmetrisk kryptering) eller mottagarens preferenser (kryptering till öppen nyckel).
-#: g10/gpg.c:3141
+#: g10/gpg.c:3144
 msgid "invalid personal cipher preferences\n"
 msgstr "ogiltig inställning av personligt chiffer\n"
 
-#: g10/gpg.c:3145
+#: g10/gpg.c:3148
 msgid "invalid personal digest preferences\n"
 msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
 
-#: g10/gpg.c:3149
+#: g10/gpg.c:3152
 msgid "invalid personal compress preferences\n"
 msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
 
-#: g10/gpg.c:3182
+#: g10/gpg.c:3185
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/gpg.c:3229
+#: g10/gpg.c:3232
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du får inte använda chifferalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3237
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "du får inte använda sammandragsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3239
+#: g10/gpg.c:3242
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "du får inte använda komprimeringsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3331
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3342
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VARNING: mottagare (-r) angivna utan att använda publik nyckel-kryptering\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3375
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av \"%s\" misslyckades: %s\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3398
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnamn]"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "du kan inte använda --symmetric --encrypt med --s2k-mode 0\n"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan inte använda --symmetric --encrypt i %s-läget\n"
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3449
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3448
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "du kan inte använda --symmetric --sign --encrypt med --s2k-mode 0\n"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3454
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "du kan inte använda --symmetric --sign --encrypt när du är i %s-läget\n"
 
-#: g10/gpg.c:3471
+#: g10/gpg.c:3474
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/gpg.c:3505
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/gpg.c:3513
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/gpg.c:3538
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/gpg.c:3623
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3627
+#: g10/gpg.c:3630
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export av nyckeln misslyckades: %s\n"
 
-#: g10/gpg.c:3638
+#: g10/gpg.c:3641
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3648
+#: g10/gpg.c:3651
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/gpg.c:3699
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/gpg.c:3707
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/gpg.c:3797
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 
-#: g10/gpg.c:3914
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/gpg.c:3918
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/gpg.c:4230
+#: g10/gpg.c:4233
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
 
-#: g10/gpg.c:4232
+#: g10/gpg.c:4235
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
 
-#: g10/gpg.c:4265
+#: g10/gpg.c:4268
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
 
@@ -2386,7 +2403,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:75 sm/gpgsm.c:374
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
@@ -3848,8 +3865,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vill du verkligen spärra denna undernyckel? (j/N) "
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "Ägartillit får inte ställas in när en tillitsdatabas används som användaren "
 "tillhandahåller\n"
@@ -6877,7 +6893,7 @@ msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
 msgid "run in multi server mode (foreground)"
 msgstr "kör i multiserverläge (förgrund)"
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:363
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 msgid "read options from file"
 msgstr "läs inställningar från fil"
 
@@ -6917,16 +6933,16 @@ msgstr ""
 "Syntax: scdaemon [flaggor] [kommando [argument]]\n"
 "Smartkortsdemon för GnuPG\n"
 
-#: scd/scdaemon.c:665
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr "använd flaggan \"--daemon\" för att köra programmet i bakgrunden\n"
 
-#: scd/scdaemon.c:1015
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "hanterare för fd %d startad\n"
 
-#: scd/scdaemon.c:1021
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "hanterare för fd %d avslutad\n"
@@ -7346,182 +7362,182 @@ msgstr "borttagning av certifikatet \"%s\" misslyckades: %s\n"
 msgid "no valid recipients given\n"
 msgstr "inga giltiga mottagare angavs\n"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:246
 msgid "|[FILE]|make a signature"
 msgstr "|[FIL]|skapa en signatur"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[FIL]|skapa en klartext-signatur"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "list external keys"
 msgstr "lista externa nycklar"
 
-#: sm/gpgsm.c:256
+#: sm/gpgsm.c:257
 msgid "list certificate chain"
 msgstr "lista certifikatkedja"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:260
 msgid "remove key from the public keyring"
 msgstr "ta bort nyckel från den publika nyckelringen"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:263
 msgid "import certificates"
 msgstr "importera certifikat"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 msgid "export certificates"
 msgstr "exportera certifikat"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 msgid "register a smartcard"
 msgstr "registrera ett smartkort"
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr "skicka ett kommando till dirmngr"
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr "starta gpg-protect-tool"
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "change a passphrase"
 msgstr "ändra en lösenfras"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:285
 msgid "create base-64 encoded output"
 msgstr "skapa base-64-kodat utdata"
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr "anta att inmatning är i PEM-format"
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr "anta att inmatning är i base-64-format"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr "anta att inmatning är i binärformat"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
 msgstr "använd systemets dirmngr om tillgängligt"
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr "kontrollera aldrig mot spärrlista"
 
-#: sm/gpgsm.c:305
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr "kontrollera giltigheten med OCSP"
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr "|N|antal certifikat att inkludera"
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr "|FIL|hämta policyinformation från FIL"
 
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr "kontrollera inte certifikatpolicier"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr "hämta saknade utfärdarcertifikat"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:325
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMN|använd NAMN som standardmottagare"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:327
 msgid "use the default key as default recipient"
 msgstr "använd standardnyckeln som standardmottagare"
 
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr "använd inte terminalen alls"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 #, fuzzy
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|FIL|skriv serverlägesloggar till FIL"
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:347
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FIL|skriv serverlägesloggar till FIL"
 
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:349
 msgid "force v3 signatures"
 msgstr "tvinga v3-signaturer"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr "använd alltid en MDC för kryptering"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr "satsläge: fråga aldrig"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr "anta ja på de flesta frågorna"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr "anta nej på de flesta frågorna"
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:359
 msgid "add this keyring to the list of keyrings"
 msgstr "lägg till denna nyckelring till listan över nyckelringar"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 msgid "add this secret keyring to the list"
 msgstr "lägg till denna hemliga nyckelring till listan"
 
-#: sm/gpgsm.c:360 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
 
-#: sm/gpgsm.c:361
+#: sm/gpgsm.c:362
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|VÄRD|använd den här nyckelservern för att slå upp nycklar"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMN|ställ in terminalteckentabell till NAMN"
 
-#: sm/gpgsm.c:366
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NIVÅ|ställ in felsökningsnivån till NIVÅ"
 
-#: sm/gpgsm.c:381
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr "|FIL|läs in tilläggsmodulen FIL"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:388
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMN|använd chifferalgoritmen NAMN"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMN|använd sammandragsalgoritmen NAMN"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "|N|use compress algorithm N"
 msgstr "|N|använd komprimeringsalgoritmen N"
 
-#: sm/gpgsm.c:571
+#: sm/gpgsm.c:573
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Användning: gpgsm [flaggor] [filer] (-h för hjälp)"
 
 # Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:576
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7531,35 +7547,35 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera med S/MIME-protokollet\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: sm/gpgsm.c:701
+#: sm/gpgsm.c:703
 msgid "usage: gpgsm [options] "
 msgstr "användning: gpgsm [flaggor] "
 
-#: sm/gpgsm.c:799
+#: sm/gpgsm.c:801
 #, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "OBSERVERA: kommer inte att kunna kryptera till \"%s\": %s\n"
 
-#: sm/gpgsm.c:810
+#: sm/gpgsm.c:812
 #, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "okänd valideringsmodell \"%s\"\n"
 
-#: sm/gpgsm.c:1369
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr "VARNING: kör med falsk systemtid: "
 
-#: sm/gpgsm.c:1465
+#: sm/gpgsm.c:1468
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "importerar vanliga certifikat \"%s\"\n"
 
-#: sm/gpgsm.c:1483
+#: sm/gpgsm.c:1486
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan inte signera med \"%s\": %s\n"
 
-#: sm/gpgsm.c:1683
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr "det här kommandot har ännu inte implementerats\n"
 
diff --git a/po/tr.po b/po/tr.po
index 0a7877532..e76e57d2a 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.9.94\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-09-14 13:27+0200\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
 "PO-Revision-Date: 2006-11-04 03:45+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@belgeler.gen.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -15,12 +15,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "PIN giriş kilidi edinilemedi: %s\n"
 
-#: agent/call-pinentry.c:438
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -28,7 +28,7 @@ msgstr ""
 "Lütfen PIN'inizi giriniz, böylelikle bu oturumda bu gizli anahtar kilitsiz "
 "olabilecek"
 
-#: agent/call-pinentry.c:441
+#: agent/call-pinentry.c:551
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -36,36 +36,53 @@ msgstr ""
 "Lütfen anahtar parolanızı giriniz, böylelikle bu oturumda bu gizli anahtar "
 "kilitsiz olabilecek"
 
-#: agent/call-pinentry.c:489
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+#, fuzzy
+msgid "Quality:"
+msgstr "geçerliliği: %s"
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 msgid "PIN too long"
 msgstr "PIN çok uzun"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:668
 msgid "Passphrase too long"
 msgstr "Anahtar Parolası çok uzun"
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:676
 msgid "Invalid characters in PIN"
 msgstr "PIN içinde geçersiz karakterler var"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr "PIN çok kısa"
 
-#: agent/call-pinentry.c:535
+#: agent/call-pinentry.c:693
 msgid "Bad PIN"
 msgstr "PIN hatalı"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:694
 msgid "Bad Passphrase"
 msgstr "Anahtar Parolası hatalı"
 
-#: agent/call-pinentry.c:572
+#: agent/call-pinentry.c:730
 msgid "Passphrase"
 msgstr "Anahtar Parolası"
 
@@ -74,21 +91,21 @@ msgstr "Anahtar Parolası"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "%d bitlikten daha büyük SSH anahtarları desteklenmiyor\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "\"%s\" oluşturulamıyor: %s\n"
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
-#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1865
-#: sm/gpgsm.c:1902 sm/gpgsm.c:1940 sm/qualified.c:72
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
@@ -128,7 +145,12 @@ msgstr "anahtarı yazarken hata: %s\n"
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Lütfen SSH anahtarı %0A  %c için anahtar parolasını giriniz"
 
-#: agent/command-ssh.c:2349
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
+msgid "Please re-enter this passphrase"
+msgstr "Lütfen bu anahtar parolasını tekrar girin"
+
+#: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
@@ -137,7 +159,12 @@ msgstr ""
 "gpg-agent'in anahtar deposuna korumak için alınan gizli anahtar %%0A  %s%%0A "
 "için lütfen anahtar parolası giriniz"
 
-#: agent/command-ssh.c:2850
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
+msgid "does not match - try again"
+msgstr "aynı değiller - tekrar deneyin"
+
+#: agent/command-ssh.c:2885
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "sokette akım oluşturulamadı: %s\n"
@@ -180,72 +207,63 @@ msgstr "Anahtar parolasını giriniz\n"
 msgid "Take this one anyway"
 msgstr "Bu anahtar yine de kullanılsın mı? (e/H ya da y/N) "
 
-#: agent/genkey.c:185
+#: agent/genkey.c:191
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u character long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u characters long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:202
+#: agent/genkey.c:212
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digit or special character."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digits or special characters."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:225
+#: agent/genkey.c:235
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
-"passphrase may not%0Abe a known term or match certain pattern."
+"Warning: You have entered an insecure passphrase.%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:238
+#: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:240
+#: agent/genkey.c:253
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:246
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:290
+#: agent/genkey.c:306
 #, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr "Anahtarınızı korumak için Lütfen Anahtar Parolanızı giriniz%0A"
 
-#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
-msgid "Please re-enter this passphrase"
-msgstr "Lütfen bu anahtar parolasını tekrar girin"
-
-#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
-#: tools/symcryptrun.c:456
-msgid "does not match - try again"
-msgstr "aynı değiller - tekrar deneyin"
-
-#: agent/genkey.c:412
+#: agent/genkey.c:429
 msgid "Please enter the new passphrase"
 msgstr "Lütfen yeni anahtar parolasını girin"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:104
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 msgid ""
 "@Options:\n"
 " "
@@ -253,63 +271,62 @@ msgstr ""
 "@Seçenekler:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr "sunucu olarak (önalanda) çalışır"
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:109
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr "artalan süreci olarak çalışır"
 
-#: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:69 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "ayrıntılı"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:341
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "biraz daha sessiz olur"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:112
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr "sh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:113
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr "csh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|DOSYA|seçenekler DOSYAdan okunur"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr "konsoldan kopulmaz"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr "klavye ve fare gaspedilmez"
 
-#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
-#: tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "sunucu için bir günlük dosyası kullanılır"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:134
 msgid "use a standard location for the socket"
 msgstr "soket için standart bir yer kullanılır"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|UYG|PIN girme uygulaması olarak UYG kullanılır"
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "[UYG|Akıllı kart uygulaması olarak UYG kullanılır"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 msgid "do not use the SCdaemon"
 msgstr "Akıllı kart süreci kullanılmaz"
 
@@ -345,17 +362,17 @@ msgstr "ssh-agent öykünümü etkinleşir"
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|DOSYA|ortam ayarlarını ayrıca DOSYAya da yazar"
 
-#: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:91 tools/symcryptrun.c:204
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204
 msgid "Please report bugs to <"
 msgstr "Yazılım hatalarını lütfen <"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] (yardım için -h)"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -363,131 +380,146 @@ msgstr ""
 "Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
 "GnuPG için gizli anahtar yönetimi\n"
 
-#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
 
-#: agent/gpg-agent.c:512 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:340 sm/gpgsm.c:819 sm/gpgsm.c:822 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, fuzzy, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "libksba çok eski (gereken %s, sizinki %s)\n"
 
-#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, 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:610 agent/gpg-agent.c:1177 g10/gpg.c:2027
-#: scd/scdaemon.c:421 sm/gpgsm.c:914 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: agent/gpg-agent.c:947 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "`%s' oluşturulurken hata: %s\n"
 
-#: agent/gpg-agent.c:1247 agent/gpg-agent.c:1373 agent/gpg-agent.c:1377
-#: agent/gpg-agent.c:1418 agent/gpg-agent.c:1422 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:908
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "`%s' dizini oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr "soketin ismi çok uzun\n"
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "soket oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
+#: agent/gpg-agent.c:1321
+#, fuzzy, c-format
+msgid "socket name `%s' is too long\n"
+msgstr "soketin ismi çok uzun\n"
+
+#: agent/gpg-agent.c:1333
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "bu oturumda çalışan gpg-agent yok\n"
 
-#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
+#, fuzzy
+msgid "error getting nonce for the socket\n"
+msgstr "yeni PIN alınırken hata: %s\n"
+
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "soket `%s'e bağlanırken hata: %s\n"
 
-#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "soket dinleme başarısız: %s\n"
 
-#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "`%s' soketi dinlemede\n"
 
-#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "dizin `%s' oluşturuldu\n"
 
-#: agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1448
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "%s için stat() başarısız oldu: %s\n"
 
-#: agent/gpg-agent.c:1438
+#: agent/gpg-agent.c:1452
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "`%s' ev dizini olarak kullanılamıyor\n"
 
-#: agent/gpg-agent.c:1549
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
+#, fuzzy, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "%s okunurken hata: %s\n"
+
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "tutamak 0x%lx, fd %d için başlatıldı\n"
 
-#: agent/gpg-agent.c:1554
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "tutamak 0x%lx, fd %d için sonlandırıldı\n"
 
-#: agent/gpg-agent.c:1571
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh tutamağı 0x%lx, fd %d için başlatıldı\n"
 
-#: agent/gpg-agent.c:1576
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh tutamağı 0x%lx, fd %d için sonlandırıldı\n"
 
-#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select başarısız: %s - 1s bekliyor\n"
 
-#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s durdu\n"
 
-#: agent/gpg-agent.c:1809
+#: agent/gpg-agent.c:1850
 msgid "no gpg-agent running in this session\n"
 msgstr "bu oturumda çalışan gpg-agent yok\n"
 
-#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:756
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
 
-#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
-#: tools/gpg-connect-agent.c:767
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokolü sürüm %d desteklenmiyor\n"
@@ -517,16 +549,16 @@ msgstr ""
 "Sözdizimi: gpg-protect-tool [seçenekler] [arg ...]\n"
 "Gizli anahtar bakım aracı\n"
 
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1188
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 "PKCS#12 nesnesinin korumasını aşmak için lütfen anahtar parolasını giriniz."
 
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1191
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "PKCS#12 nesnesini korumak için lütfen anahtar parolasını giriniz."
 
-#: agent/protect-tool.c:1216
+#: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -534,7 +566,7 @@ msgstr ""
 "Lütfen GnuPG sistemine ithal edilen nesneyi koruyacak anahtar parolasını "
 "giriniz."
 
-#: agent/protect-tool.c:1221
+#: agent/protect-tool.c:1199
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -542,16 +574,16 @@ msgstr ""
 "Lütfen bu işlemi tamamlamak için gereken\n"
 "PIN'i veya anahtar parolasını giriniz."
 
-#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 msgid "Passphrase:"
 msgstr "Anahtar Parolası:"
 
-#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "anahtar parolası sorulurken hata: %s\n"
 
-#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 msgid "cancelled\n"
 msgstr "iptal edildi\n"
 
@@ -665,7 +697,8 @@ msgstr "anahtar parolası değiştirir"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1338
+#: tools/gpgconf-comp.c:1641
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "boru oluşturulurken hata: %s\n"
@@ -809,75 +842,80 @@ msgstr "%lu bayt ayrılırken güvenli bellekte nüve dışına çıkıldı"
 msgid "out of core while allocating %lu bytes"
 msgstr "%lu bayt ayrılırken nüve dışına çıkıldı"
 
-#: g10/armor.c:366
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr "zırh: %s\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr "zırh başlığı geçersiz: "
 
-#: g10/armor.c:416
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr "zırh başlığı: "
 
-#: g10/armor.c:427
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr "açıkça okunabilen imza başlığı geçersiz\n"
 
-#: g10/armor.c:479
+#: g10/armor.c:455
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "zırh başlığı: "
+
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr "açıkça okunabilen imzalar dahil edildi\n"
 
-#: g10/armor.c:614
+#: g10/armor.c:643
 msgid "unexpected armor: "
 msgstr "beklenmeyen zırh: "
 
-#: g10/armor.c:626
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr "araçizgisi escape'lı satır geçersiz: "
 
-#: g10/armor.c:780 g10/armor.c:1390
+#: g10/armor.c:809 g10/armor.c:1419
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "geçersiz radix64 karakteri %02X atlandı\n"
 
-#: g10/armor.c:823
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr "dosya sonu belirsiz (CRC yok)\n"
 
-#: g10/armor.c:857
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr "dosya sonu belirsiz (CRC içinde)\n"
 
-#: g10/armor.c:865
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr "CRC bozulmuş\n"
 
-#: g10/armor.c:869 g10/armor.c:1427
+#: g10/armor.c:898 g10/armor.c:1456
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC hatası; %06lX - %06lX\n"
 
-#: g10/armor.c:889
+#: g10/armor.c:918
 msgid "premature eof (in trailer)\n"
 msgstr "dosya sonu belirsiz (kuyruk içinde)\n"
 
-#: g10/armor.c:893
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr "kuyruk satırında hata\n"
 
-#: g10/armor.c:1204
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr "geçerli OpenPGP verisi yok\n"
 
-#: g10/armor.c:1209
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "geçersiz zırh: satır %d karakterden uzun\n"
 
-#: g10/armor.c:1213
+#: g10/armor.c:1242
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1196,11 +1234,11 @@ msgstr "Yönetici komutlarına izin verilmez\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 
-#: g10/decrypt.c:110 g10/encode.c:890
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' açılamadı\n"
@@ -1211,7 +1249,7 @@ msgstr "`%s' açılamadı\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "anahtar \"%s\" yok: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1251,7 +1289,7 @@ msgstr "genel anahtar \"%s\" için bir gizli anahtar var!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "onu önce \"--delete-secret-keys\" ile silmelisiniz.\n"
 
-#: g10/encode.c:226 g10/sign.c:1296
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
@@ -1270,7 +1308,7 @@ msgstr "%s şifrelemesi kullanılıyor\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' zaten sıkıştırılmış\n"
 
-#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "UYARI: \"%s\" dosyası boş\n"
@@ -1299,7 +1337,7 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı "
 "zorlanıyor\n"
 
-#: g10/encode.c:669 g10/sign.c:966
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1308,18 +1346,18 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) sıkıştırma algoritması "
 "kullanılmak isteniyor\n"
 
-#: g10/encode.c:765
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı zorlanıyor\n"
 
-#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
 
-#: g10/encode.c:862
+#: g10/encode.c:848
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s \"%s\" için şifrelendi\n"
@@ -1499,7 +1537,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:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1507,132 +1545,132 @@ msgstr ""
 "@Komutlar:\n"
 " "
 
-#: g10/gpg.c:370
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[dosya]|bir imza yapar"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
 
-#: g10/gpg.c:372 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "bağımsız bir imza yapar"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "veriyi şifreler"
 
-#: g10/gpg.c:375 sm/gpgsm.c:248
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik şifre ile şifreler"
 
-#: g10/gpg.c:377 sm/gpgsm.c:249
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "bir imzayı doğrular"
 
-#: g10/gpg.c:381 sm/gpgsm.c:252
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "anahtarları listeler"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "anahtarları ve imzaları listeler"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "list and check key signatures"
 msgstr "anahtar imzalarını listeler ve sınar"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/gpg.c:386 sm/gpgsm.c:254
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "gizli anahtarları listeler"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "remove keys from the public keyring"
 msgstr "anahtarları genel anahtarlıktan kaldırır"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "remove keys from the secret keyring"
 msgstr "anahtarları gizli anahtarlıktan kaldırır"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "bir anahtarı imzalar"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "bir anahtarı yerel olarak imzalar"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "bir anahtarı düzenler ve imzalar"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "anahtarları gönderir"
 
-#: g10/gpg.c:397 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:402
 msgid "search for keys on a key server"
 msgstr "bir anahtar sunucusunda anahtarları arar"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "update all keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan günceller"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "anahtarları indirir/katıştırır"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr "kart durumunu basar"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr "kart üzerindeki veriyi değiştirir"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr "bir kartın PIN'ini değiştirir"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr "güvence veritabanını günceller"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
 
-#: g10/gpg.c:430 sm/gpgsm.c:264
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr "sunucu kipinde çalışır"
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1642,47 +1680,48 @@ msgstr ""
 "Seçenekler:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:281
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/gpg.c:436 sm/gpgsm.c:293
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|İSİM|İSİM için şifreleme yapar"
 
-#: g10/gpg.c:447 sm/gpgsm.c:331
+#: g10/gpg.c:449 sm/gpgsm.c:333
 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:448 sm/gpgsm.c:334
+#: g10/gpg.c:450 sm/gpgsm.c:336
 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:453 sm/gpgsm.c:336
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullanır"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
-msgid "use as output file"
-msgstr "çıktı dosyası olarak kullanılır"
+#: g10/gpg.c:469 sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "|DOSYA|seçenekler DOSYAdan okunur"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "üzerine yazmadan önce sorar"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr "kesin OpenPGP davranışı etkin olur"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x uyumlu iletiler üretilir"
 
-#: g10/gpg.c:553 sm/gpgsm.c:397
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1690,7 +1729,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:400
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1710,17 +1749,17 @@ msgstr ""
 " --list-keys [isimler]      anahtarları listeler\n"
 " --fingerprint [isimler]    parmak izlerini gösterir\n"
 
-#: g10/gpg.c:750 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Yazılım hatalarını lütfen <gnupg-bugs@gnu.org> adresine,\n"
 "çeviri hatalarını ise <gnu-tr@belgeler.org> adresine bildiriniz.\n"
 
-#: g10/gpg.c:767
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1730,7 +1769,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:578
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1738,552 +1777,556 @@ msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/gpg.c:784
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "Şifre: "
 
-#: g10/gpg.c:798
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:805 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
-#: g10/gpg.c:875
+#: g10/gpg.c:817 sm/gpgsm.c:603
+msgid "Used libraries:"
+msgstr ""
+
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:715
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/gpg.c:1063
+#: g10/gpg.c:1113
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grup tanımı '%s' içinde = işareti yok\n"
 
-#: g10/gpg.c:1260
+#: g10/gpg.c:1310
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizininde güvensiz iyelik\n"
 
-#: g10/gpg.c:1263
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz iyelik\n"
 
-#: g10/gpg.c:1266
+#: g10/gpg.c:1316
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz iyelik\n"
 
-#: g10/gpg.c:1272
+#: g10/gpg.c:1322
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "UYARI: UYARI: '%s' evdizininde güvensiz izinler\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1325
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz izinler\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1328
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz izinler\n"
 
-#: g10/gpg.c:1284
+#: g10/gpg.c:1334
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizinindeki ilgili dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1337
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1340
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1296
+#: g10/gpg.c:1346
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizinindeki ilgili dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1349
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1352
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1445
+#: g10/gpg.c:1495
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr "anahtarların listelenmesi sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr "imza listelemesi sırasında poliçe URLleri gösterilir"
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1594
 msgid "show all notations during signature listings"
 msgstr "imza listelemesi sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr "imza listelemesi sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr "imza listelemesi sırasında kullanıcı kanaklı simgelemleri gösterir"
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1602
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "imza listelemesi sırasında tercih edilen anahtar sunucusu adresi gösterilir"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr "anahtar listelemesi sırasında kullanıcı kimliği geçerliliğini gösterir"
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "anahtar listelerinde yürürlükten kaldırılmış ve zamanaşımına uğramış "
 "kullanıcı kimlikleri gösterilir"
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 "anahtar listelerinde yürürlükten kaldırılmış ve zamanaşımına uğramış "
 "yardımcı anahtarlar gösterilir"
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1610
 msgid "show the keyring name in key listings"
 msgstr "anahtar listelerinde anahtarlık ismini gösterir"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1612
 msgid "show expiration dates during signature listings"
 msgstr "imza listelemesi sırasında zamanaşımı tarihleri gösterilir"
 
-#: g10/gpg.c:1825
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt çok eski (%s lazım, sizinki %s)\n"
 
-#: g10/gpg.c:1981
+#: g10/gpg.c:2030
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "BİLGİ: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n"
 
-#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "BİLGİ: %s normal kullanım için değil!\n"
 
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "'%s' geçerli bir imza zamanaşımı değil\n"
 
-#: g10/gpg.c:2493
+#: g10/gpg.c:2565
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/gpg.c:2528
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2603
 msgid "invalid keyserver options\n"
 msgstr "anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2610
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2613
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2620
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/gpg.c:2551
+#: g10/gpg.c:2623
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2630
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2561
+#: g10/gpg.c:2633
 msgid "invalid list options\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr "imza doğrulaması sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr "imza doğrulaması sırasında poliçe adreslerini gösterir"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2645
 msgid "show all notations during signature verification"
 msgstr "imza doğrulaması sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr "imza doğrulaması sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri gösterir"
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2653
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "imza doğrulaması sırasında tercih edilen anahtar sunucusu adresleri "
 "gösterilir"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2655
 msgid "show user ID validity during signature verification"
 msgstr "imza doğrulaması sırasında kullanıcı kimliği geçerliliğini gösterir"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "imza doğrulamasında yürürlükten kaldırılan ve zamanaşımına uğrayan kullanıcı "
 "kimlikleri gösterilir"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2659
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 "imza doğrulamasında yürürlükten kaldırılan ve zamanaşımına uğrayan kullanıcı "
 "kimlikleri gösterilir"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr "imzaları PKA verisi ile doğrular"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "imzaların güvenilirliğini geçerli PKA verisi ile yükseltir"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2670
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2673
 msgid "invalid verify options\n"
 msgstr "doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2855
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1298
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2975
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "%s olmasından dolayı güvensiz bellekle çalıştırılmayacak\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2 kipindeyken sadece ayrık veya sade imzalar yapabilirsiniz\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde aynı anda hem imzalama hem de şifreleme yapamazsınız\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız.\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:3014
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1370
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1378
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3092
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3098
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3117
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3119
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "öntanımlı sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3121
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "asgari sertifika seviyesi geçersiz; 1, 2, ya da 3 olabilir\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3135
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3144
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3148
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özümleme tercihleri geçersiz\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3152
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3185
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3232
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3237
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' özümleme algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3242
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' sıkıştırma algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "UYARI: alıcılar (-r) genel anahtar şifrelemesi kullanılmadan belirtilmiş\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3375
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' için simetrik şifreleme başarısız: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3398
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--s2k-mode 0 ile  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s kipindeyken  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3449
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--s2k-mode 0 ile --symmetric --sign --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3454
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s kipindeyken --symmetric --sign --encrypt kullanamazsınız.\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3474
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "anahtar sunucusuna gönderim başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "anahtar sunucusundan alım başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3630
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3641
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3651
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' çittirim algoritması geçersiz\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4233
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4235
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4268
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
@@ -2295,7 +2338,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:75 sm/gpgsm.c:372
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr "|FD|durum bilgisini bu FD'ye yazar"
 
@@ -2827,13 +2870,13 @@ msgstr "anahtar %s: yeni anahtar - atlandı\n"
 msgid "no writable keyring found: %s\n"
 msgstr "yazılabilir bir anahtarlık yok: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "\"%s\"e yazıyor\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2369 g10/import.c:2391
+#: g10/import.c:2381 g10/import.c:2403
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "\"%s\" anahtarlığına yazarken hata oluştu: %s\n"
@@ -2922,7 +2965,7 @@ msgstr "anahtar %s: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
 msgid "importing secret keys not allowed\n"
 msgstr "gizli anahtarı alımına izin verilmez\n"
 
-#: g10/import.c:1158 g10/import.c:2384
+#: g10/import.c:1158 g10/import.c:2396
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "öntanımlı gizli anahtarlık yok: %s\n"
@@ -3048,44 +3091,44 @@ msgstr "anahtar %s: yardımcı anahtar imzası yanlış yerde - atlandı\n"
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "anahtar %s: umulmayan imza sınıfı (0x%02X) - atlandı\n"
 
-#: g10/import.c:1732
+#: g10/import.c:1744
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "anahtar %s: çift kullanıcı kimliği saptandı - birleştirildi\n"
 
-#: g10/import.c:1794
+#: g10/import.c:1806
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "UYARI: anahtar %s yürürlükten kaldırılmış olmalı: yürürlükten kaldırma "
 "anahtarı %s alınıyor\n"
 
-#: g10/import.c:1808
+#: g10/import.c:1820
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "UYARI: anahtar %s yürürlükten kaldırılmış olabilir: yürürlükten kaldırma "
 "anahtarı %s mevcut değil.\n"
 
-#: g10/import.c:1867
+#: g10/import.c:1879
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası eklendi\n"
 
-#: g10/import.c:1901
+#: g10/import.c:1913
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2302
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "BİLGİ: bir anahtarın seri numarası kartlardan biriyle uyuşmuyor\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2310
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "BİLGİ: asıl anahtar kart üzerinde saklı ve kullanılabilir\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2312
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "BİLGİ: ikincil anahtar kart üzerinde saklı ve kullanılabilir\n"
 
@@ -3391,7 +3434,7 @@ msgid "Really sign? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H veya y/N) "
 
 #: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:348
+#: g10/keyedit.c:5019 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
@@ -3747,8 +3790,7 @@ msgstr ""
 "ya da y/N) "
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "Kullanıcı taraından sağlanmış bir güvence veritabanı kullanılarak "
 "sahibiningüvencesi belirlenemez\n"
@@ -4629,14 +4671,14 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:273
+#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:275
+#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5229,17 +5271,17 @@ msgstr "Sıkıştırılmamış"
 msgid "uncompressed|none"
 msgstr "Sıkıştırılmamış|yok"
 
-#: g10/misc.c:874
+#: g10/misc.c:891
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "bu ileti %s tarafından kullanılamayabilir\n"
 
-#: g10/misc.c:1049
+#: g10/misc.c:1066
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "`%s' seçeneği belirsiz\n"
 
-#: g10/misc.c:1074
+#: g10/misc.c:1091
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "`%s' seçeneği bilinmiyor\n"
@@ -5296,12 +5338,12 @@ msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:603
+#: g10/passphrase.c:295 g10/passphrase.c:581
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (asıl anahtar kimliği %s)"
 
-#: g10/passphrase.c:327
+#: g10/passphrase.c:309
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5312,24 +5354,24 @@ msgstr ""
 "kullanıcısının gizli anahtarını açacak bir anahtar parolasına ihtiyaç var.\n"
 "%u bitlik %s anahtarı, kimlik %s, oluşturma tarihi %s%s\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:334
 msgid "Repeat passphrase\n"
 msgstr "Parolayı tekrar yazınız\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:336
 msgid "Enter passphrase\n"
 msgstr "Anahtar parolasını giriniz\n"
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:363
 msgid "cancelled by user\n"
 msgstr "kullanıcı tarafından durduruldu\n"
 
-#: g10/passphrase.c:384 g10/passphrase.c:450
+#: g10/passphrase.c:369 g10/passphrase.c:428
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "aracı ile sorun var: %s\n"
 
-#: g10/passphrase.c:582
+#: g10/passphrase.c:560
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5338,12 +5380,12 @@ msgstr ""
 "Gizli anahtarın kilidini açmak için bir anahtar parolasına ihtiyacınız var.\n"
 "Anahtarın sahibi: \"%s\"\n"
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:568
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u bitlik %s anahtarı, %s kimliği ile %s tarihinde üretilmiş"
 
-#: g10/passphrase.c:599
+#: g10/passphrase.c:577
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (asıl anahtar kimliği %s üzerinde yardımcı anahtar)"
@@ -5979,30 +6021,14 @@ msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
 "anahtar %s: yardımcı anahtarı garantileme imzası için yardımcı anahtar yok\n"
 
-#: g10/sign.c:82
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "simgelem verisi v3 (PGP 2.x tarzı) imzalara konulamaz\n"
-
-#: g10/sign.c:90
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "simgelem verisi v3 (PGP 2.x tarzı) anahtar imzalarına konulamaz\n"
-
-#: g10/sign.c:104
+#: g10/sign.c:89
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "UYARI: %% genişletmeli simgelem imkansız (çok büyük). Genişletilmeden "
 "kullanılıyor.\n"
 
-#: g10/sign.c:121
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "poliçe URL'si v3 (PGP 2.x tarzı) imzalara konulamaz\n"
-
-#: g10/sign.c:129
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr "poliçe URL'si v3 (PGP 2.x tarzı) anahtar imzalarına konulamaz\n"
-
-#: g10/sign.c:142
+#: g10/sign.c:115
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
@@ -6010,7 +6036,7 @@ msgstr ""
 "UYARI: güvence adresi için %%lik uzatma imkansız (çok büyük).\n"
 "Uzatılmadan kullanılıyor.\n"
 
-#: g10/sign.c:170
+#: g10/sign.c:138
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
@@ -6019,22 +6045,22 @@ msgstr ""
 "UYARI: tercih edilen anahtar sunucu adresi için %%lik uzatma imkansız\n"
 "(çok büyük). Uzatılmadan kullanılıyor.\n"
 
-#: g10/sign.c:343
+#: g10/sign.c:311
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
 
-#: g10/sign.c:352
+#: g10/sign.c:320
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s imza: \"%s\" den\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla ayrık imza yapabilirsiniz\n"
 
-#: g10/sign.c:864
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6042,17 +6068,17 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) özümleme algoritması "
 "kullanılmak isteniyor\n"
 
-#: g10/sign.c:991
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "imzalanıyor:"
 
-#: g10/sign.c:1106
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla açık imzalama "
 "yapabilirsiniz\n"
 
-#: g10/sign.c:1290
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s şifrelemesi kullanılmayacak\n"
@@ -6754,43 +6780,43 @@ msgstr "Yönetici PIN'inin doğrulanması bu komut yüzünden şimdilik yasaktı
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr "çoklu sunucu kipinde çalışır (önalanda)"
 
-#: scd/scdaemon.c:114 sm/gpgsm.c:361
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 msgid "read options from file"
 msgstr "seçenekler dosyadan okunur"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr "|N|N. porttaki okuyucuya bağlanır"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:122
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|İSİM|ct-API sürücüsü olarak İSİM kullanılır"
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:123
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|İSİM|PC/SC sürücüsü olarak İSİM kullanılır"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:126
 msgid "do not use the internal CCID driver"
 msgstr "dahili CCID sürücüsü kullanılmaz"
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr "bir okuyucu tuştakımı kullanılmaz"
 
-#: scd/scdaemon.c:135
+#: scd/scdaemon.c:132
 msgid "allow the use of admin card commands"
 msgstr "yönetici kartı komutları kullanımına izin verir"
 
-#: scd/scdaemon.c:209
+#: scd/scdaemon.c:210
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Kullanımı: scdaemon [seçenekler] (yardım için -h)"
 
-#: scd/scdaemon.c:211
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6798,18 +6824,18 @@ msgstr ""
 "Sözdizimi: scdaemon [seçenekler] [komut [arg ...]]\n"
 "GnuPG için akıllı kart artalan süreci\n"
 
-#: scd/scdaemon.c:658
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 "Programı artalanda çalışır bırakmak için lütfen `--daemon' seçeneğini "
 "kullanın\n"
 
-#: scd/scdaemon.c:1006
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "fd %d için eylemci başlatıldı\n"
 
-#: scd/scdaemon.c:1011
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "fd %d için eylemci sonlandı\n"
@@ -6842,11 +6868,11 @@ msgstr "dirmngr'a bağlanılamıyor - son çareye başvuruluyor\n"
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1631
+#: sm/certchain.c:195 sm/certchain.c:1646
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1631
+#: sm/certchain.c:196 sm/certchain.c:1646
 msgid "shell"
 msgstr ""
 
@@ -6885,8 +6911,8 @@ msgstr "harici bir sertifikacı arar\n"
 msgid "number of issuers matching: %d\n"
 msgstr "eşleşen sertifikacı sayısı: %d\n"
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
 msgid "failed to allocated keyDB handle\n"
 msgstr "ayrılmış anahtar veritabanı elde edilemedi: %s\n"
 
@@ -7050,7 +7076,7 @@ msgstr "başka bir eşleşmesi olası CA sertifikası var - tekrar deneniyor"
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "sertifika zinciri CA tarafından izin verilenden uzun (%d)"
 
-#: sm/certchain.c:1462 sm/certchain.c:1730
+#: sm/certchain.c:1462 sm/certchain.c:1745
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "sertifika zinciri çok uzun\n"
@@ -7065,11 +7091,11 @@ msgstr "yinelenmiş sertifika `%s' silindi\n"
 msgid "root certificate is good\n"
 msgstr "kök sertifika güvenilir olarak imli değil"
 
-#: sm/certchain.c:1620
+#: sm/certchain.c:1635
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1629
+#: sm/certchain.c:1644
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7084,7 +7110,7 @@ msgstr "DSA anahtarı %s, güvensiz bir çittirim (%u bitlik) kullanıyor\n"
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(bu, MD2 algoritmasıdır)\n"
 
@@ -7096,23 +7122,23 @@ msgstr "yok"
 msgid "[none]"
 msgstr "[yok]"
 
-#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
+#: sm/certdump.c:583 sm/certdump.c:628 sm/certdump.c:693 sm/certdump.c:746
 msgid "[Error - invalid encoding]"
 msgstr "[Hata - kodlama geçersiz]"
 
-#: sm/certdump.c:558 sm/certdump.c:603
+#: sm/certdump.c:591 sm/certdump.c:636
 msgid "[Error - out of core]"
 msgstr "[Hata - nüve dışında]"
 
-#: sm/certdump.c:640 sm/certdump.c:696
+#: sm/certdump.c:673 sm/certdump.c:729
 msgid "[Error - No name]"
 msgstr "[Hata - Adsız]"
 
-#: sm/certdump.c:665 sm/certdump.c:719
+#: sm/certdump.c:698 sm/certdump.c:752
 msgid "[Error - invalid DN]"
 msgstr "[Hata - DN geçersiz]"
 
-#: sm/certdump.c:936
+#: sm/certdump.c:946
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7238,171 +7264,181 @@ msgstr "\"%s\" sertifikası silinemedi: %s\n"
 msgid "no valid recipients given\n"
 msgstr "geçerli alıcılar verilmedi\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:246
 msgid "|[FILE]|make a signature"
 msgstr "|[DOSYA]|bir imza yapar"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[DOSYA]|açıkça okunabilen bir imza yapar"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 msgid "list external keys"
 msgstr "harici anahtarları listeler"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
 msgid "list certificate chain"
 msgstr "sertifika zincirini listeler"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:260
 msgid "remove key from the public keyring"
 msgstr "anahtarları genel anahtarlıktan kaldırır"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 msgid "import certificates"
 msgstr "sertifikaları ithal eder"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:264
 msgid "export certificates"
 msgstr "sertifikaları ihraç eder"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "register a smartcard"
 msgstr "bir akıllı kartı kayda alır"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr "dirmngr'a bir komut aktarır"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr "gpg-protect-tool'u çalıştırır"
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:270
 msgid "change a passphrase"
 msgstr "anahtar parolası değiştirir"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
 msgid "create base-64 encoded output"
 msgstr "base-64 kodlu çıktı oluşturur"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr "girdinin PEM biçiminde olduğu kabul edilir"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr "girdinin base-64 biçiminde olduğu kabul edilir"
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr "girdinin ikilik biçimde olduğu kabul edilir"
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
 msgstr "elverişliyse sistemin dirmngr'ı kullanılır"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr "asla bir CRL sormaz"
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr "doğruluğu OCSP kullarak sınar"
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr "|N|içerilecek sertifika sayısı"
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr "|DOSYA|poliçe bilgisi DOSYAdan alınır"
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr "sertifika poliçeleri sınanmaz"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr "kayıp sertifikacı sertifikalarını alır"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 msgid "|NAME|use NAME as default recipient"
 msgstr "|İSİM|öntanımlı alıcı olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 msgid "use the default key as default recipient"
 msgstr "öntanımlı alıcı olarak öntanımlı anahtar kullanılır"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr "terminali hiç kullanma"
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:345
+#, fuzzy
+msgid "|FILE|write a server mode log to FILE"
+msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
+
+#: sm/gpgsm.c:347
+#, fuzzy
+msgid "|FILE|write an audit log to FILE"
+msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
+
+#: sm/gpgsm.c:349
 msgid "force v3 signatures"
 msgstr "v3 imzalarına zorlar"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr "şifreleme için daima bir MDC kullanılır"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr "önceden belirlenmiş işlemler kipi: hiç sormaz"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr "soruların çoğunda cevap evet farzedilir"
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr "soruların çoğunda cevap hayır farzedilir"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:359
 msgid "add this keyring to the list of keyrings"
 msgstr "bu anahtarlığı anahtarlık listesine ekler"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:360
 msgid "add this secret keyring to the list"
 msgstr "bu gizli anahtarlığı listeye ekler"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|MAKİNA|anahtarları aramak için bu anahtar sunucusu kullanılır"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:363
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|İSİM|terminal karakter setini İSİM olarak ayarlar"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LDÜZEY|hata ayıklama düzeyini DÜZEY yapar"
 
-#: sm/gpgsm.c:379
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSYA|genişletme modülü olarak DOSYA yüklenir"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:388
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:390
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|İSİM|özümleme algoritması olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:392
 msgid "|N|use compress algorithm N"
 msgstr "|N|sıkıştırma algoritması olarak N kullanılır"
 
-#: sm/gpgsm.c:568
+#: sm/gpgsm.c:573
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Kullanımı: gpgsm [seçenekler] [dosyalar] (yardım için -h)"
 
-#: sm/gpgsm.c:571
+#: sm/gpgsm.c:576
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7412,35 +7448,35 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme S/MIME protokolü kullanarak yapılır\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: sm/gpgsm.c:650
+#: sm/gpgsm.c:703
 msgid "usage: gpgsm [options] "
 msgstr "kullanımı: gpgsm [seçenekler] "
 
-#: sm/gpgsm.c:748
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "`%s'e şifrelenemez: %s\n"
 
-#: sm/gpgsm.c:759
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "`%s' seçeneği bilinmiyor\n"
 
-#: sm/gpgsm.c:1315
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
 
-#: sm/gpgsm.c:1411
+#: sm/gpgsm.c:1468
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "ortak sertifikalar `%s' ithal ediliyor\n"
 
-#: sm/gpgsm.c:1429
+#: sm/gpgsm.c:1486
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "`%s' kullanarak imzalanamıyor: %s\n"
 
-#: sm/gpgsm.c:1612
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr "bu komut henüz gerçeklenmedi\n"
 
@@ -7462,7 +7498,7 @@ msgstr "temel sertifika sınamaları başarısız oldu - ithal edilmedi\n"
 msgid "error importing certificate: %s\n"
 msgstr "sertifika ithal edilirken hata: %s\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:1274
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "girdi okunurken hata: %s\n"
@@ -7523,17 +7559,17 @@ msgstr "bayraklar saklanırken hata: %s\n"
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr "GPG_TTY atanmamıştı - kullanımı sorunlara yolaçabilir\n"
 
-#: sm/qualified.c:111
+#: sm/qualified.c:105
 #, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "`%s', %d. satırındaki biçimli parmakizi geçersiz\n"
 
-#: sm/qualified.c:129
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr "`%s', %d. satırındaki ülke kodu geçersiz\n"
 
-#: sm/qualified.c:225
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7549,7 +7585,7 @@ msgstr ""
 "\n"
 "%s%sBunu yapmak istediğinizden emin misiniz?"
 
-#: sm/qualified.c:234 sm/verify.c:536
+#: sm/qualified.c:209 sm/verify.c:580
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7557,7 +7593,7 @@ msgstr ""
 "Bu yazılımın böyle imzaları oluşturmak ve doğrulamak için resmi onaylı "
 "olmadığına dikkat ediniz.\n"
 
-#: sm/qualified.c:327
+#: sm/qualified.c:277
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7573,61 +7609,70 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "nitelikli sertifika için sınama başarısız: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:424
 msgid "Signature made "
 msgstr "İmza "
 
-#: sm/verify.c:392
+#: sm/verify.c:428
 msgid "[date not given]"
 msgstr "[belirtilmeyen tarihte]"
 
-#: sm/verify.c:393
+#: sm/verify.c:429
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr " sertifika kimliği %08lX kullanılarak yapıldı\n"
 
-#: sm/verify.c:514
+#: sm/verify.c:558
 msgid "Good signature from"
 msgstr "Buradaki imzeler iyi:"
 
-#: sm/verify.c:515
+#: sm/verify.c:559
 msgid "                aka"
 msgstr "        nam-ı diğer"
 
-#: sm/verify.c:533
+#: sm/verify.c:577
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "Bu bir öz-imza olacak.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
 msgid "quiet"
 msgstr "sessiz"
 
-#: tools/gpg-connect-agent.c:60
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr "veri çıktısını onaltılık kodlamayla basar"
 
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|İSİM|Assuan soketi İSİMe bağlanır"
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr "komut satırında verilen Assuan sunucu çalıştırılır"
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr "ek bağlantı kipi kullanılmaz"
 
-#: tools/gpg-connect-agent.c:127
+#: tools/gpg-connect-agent.c:74
+#, fuzzy
+msgid "|FILE|run commands from FILE on startup"
+msgstr "|DOSYA|seçenekler DOSYAdan okunur"
+
+#: tools/gpg-connect-agent.c:75
+msgid "run /subst on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:174
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Kullanımı: gpg-connect-agent [seçenekler] (yardım için -h)"
 
-#: tools/gpg-connect-agent.c:130
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -7635,205 +7680,214 @@ msgstr ""
 "Sözdizimi: gpg-connect-agent [seçenekler]\n"
 "Çalışan bir aracıya bağlanıp komutları gönderir\n"
 
-#: tools/gpg-connect-agent.c:314
+#: tools/gpg-connect-agent.c:1155
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "\"%s\" seçeneği bir program ve seçimlik argümanlar gerektirir\n"
 
-#: tools/gpg-connect-agent.c:323
+#: tools/gpg-connect-agent.c:1164
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "\"%2$s\" nedeniyle \"%1$s\" seçeneği yoksayıldı\n"
 
-#: tools/gpg-connect-agent.c:381
+#: tools/gpg-connect-agent.c:1219 tools/gpg-connect-agent.c:1645
+#, c-format
+msgid "receiving line failed: %s\n"
+msgstr "satır alımı başarısız: %s\n"
+
+#: tools/gpg-connect-agent.c:1299
 msgid "line too long - skipped\n"
 msgstr "satır çok uzun - atlandı\n"
 
-#: tools/gpg-connect-agent.c:385
+#: tools/gpg-connect-agent.c:1303
 msgid "line shortened due to embedded Nul character\n"
 msgstr "gömülü boş karakterden dolayı satır kısaldı\n"
 
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:1619
 #, c-format
 msgid "unknown command `%s'\n"
 msgstr "komut `%s' bilinmiyor\n"
 
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:1637
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "satır göndirimi başarısız: %s\n"
 
-#: tools/gpg-connect-agent.c:473
-#, c-format
-msgid "receiving line failed: %s\n"
-msgstr "satır alımı başarısız: %s\n"
-
-#: tools/gpg-connect-agent.c:789
+#: tools/gpg-connect-agent.c:1986
 #, c-format
 msgid "error sending %s command: %s\n"
 msgstr "%s komutu gönderilirken hata: %s\n"
 
-#: tools/gpg-connect-agent.c:798
+#: tools/gpg-connect-agent.c:1995
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "standart seçenekler gönderilirken hata: %s\n"
 
-#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
-#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
+#: tools/gpgconf-comp.c:459 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:773
 msgid "Options controlling the diagnostic output"
 msgstr "Tanı çıktısını denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:796
 msgid "Options controlling the configuration"
 msgstr "Yapılandırmayı denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
-#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
+#: tools/gpgconf-comp.c:482 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:803
 msgid "Options useful for debugging"
 msgstr "Hata ayıklamaya elverişli seçenekler"
 
-#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
-#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:487 tools/gpgconf-comp.c:606 tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:729 tools/gpgconf-comp.c:811
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
 
-#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:737
 msgid "Options controlling the security"
 msgstr "Güvenliği denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:504
+#: tools/gpgconf-comp.c:502
 #, fuzzy
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:506
 #, fuzzy
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
 
-#: tools/gpgconf-comp.c:512
+#: tools/gpgconf-comp.c:510
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:526
+#: tools/gpgconf-comp.c:524
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:527
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:531
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:535
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:539
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:543
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
 
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:547
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "anahtar parolasının önceden atanmasına izin verilir"
 
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:710
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|İSİM|İSİM için şifreleme yapar"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:669
 msgid "Configuration for Keyservers"
 msgstr "Anahtar sunucular için yapılandırma"
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:674
 msgid "allow PKA lookups (DNS requests)"
 msgstr "PKA aramalarına izin verilir (DNS istekleri)"
 
-#: tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:719
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:744
+#: tools/gpgconf-comp.c:742
 msgid "do not check CRLs for root certificates"
 msgstr "kök sertifikalar için CRLler sınanmaz"
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:786
 msgid "Options controlling the format of the output"
 msgstr "Çıktı biçimini denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:824
+#: tools/gpgconf-comp.c:822
 msgid "Options controlling the interactivity and enforcement"
 msgstr "Etkileşimliliği ve zorlamayı denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:834
+#: tools/gpgconf-comp.c:832
 msgid "Configuration for HTTP servers"
 msgstr "HTTP sunucuları için yapılandırma"
 
-#: tools/gpgconf-comp.c:845
+#: tools/gpgconf-comp.c:843
 msgid "use system's HTTP proxy setting"
 msgstr "sistemin HTTP vekil ayarları kullanılır"
 
-#: tools/gpgconf-comp.c:850
+#: tools/gpgconf-comp.c:848
 msgid "Configuration of LDAP servers to use"
 msgstr "Kullanılacak LDAP sunucularının yapılandırması"
 
-#: tools/gpgconf-comp.c:887
+#: tools/gpgconf-comp.c:885
 msgid "Configuration for OCSP"
 msgstr "OCSP için yapılandırma"
 
-#: tools/gpgconf-comp.c:2982
+#: tools/gpgconf-comp.c:3006
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
 msgid "list all components"
 msgstr "tüm bileşenleri listeler"
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:59
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|list options"
 msgstr "|BİLEŞEN|seçenekleri listeler"
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "|COMPONENT|change options"
 msgstr "|BİLEŞEN|seçenekleri değiştirir"
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
+#, fuzzy
+msgid "list global configuration file"
+msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
+
+#: tools/gpgconf.c:67
 #, fuzzy
 msgid "check global configuration file"
 msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:71
+msgid "use as output file"
+msgstr "çıktı dosyası olarak kullanılır"
+
+#: tools/gpgconf.c:75
 msgid "activate changes at runtime, if possible"
 msgstr "mümkünse değişiklikleri çalışma sırasında etkin kılar"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Kullanımı: gpgconf [seçenekler] (yardım için -h)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:100
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
@@ -7841,19 +7895,19 @@ msgstr ""
 "Sözdizimi: gpgconf [seçenekler]\n"
 "GnuPG sisteminin araçları için yapılandırma seçeneklerini yönetir\n"
 
-#: tools/gpgconf.c:176 tools/gpgconf.c:209
+#: tools/gpgconf.c:202 tools/gpgconf.c:240
 msgid "usage: gpgconf [options] "
 msgstr "kullanımı: gpgconf [seçenekler] "
 
-#: tools/gpgconf.c:178
+#: tools/gpgconf.c:204
 msgid "Need one component argument"
 msgstr "Tek bileşen argümanı gerekiyor"
 
-#: tools/gpgconf.c:187
+#: tools/gpgconf.c:213
 msgid "Component not found"
 msgstr "Bileşen yok"
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:242
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Yönetici komutlarına izin verilmez\n"
@@ -7946,91 +8000,103 @@ msgstr "%s okunurken hata: %s\n"
 msgid "error closing %s: %s\n"
 msgstr "%s kapanırken hata: %s\n"
 
-#: tools/symcryptrun.c:515
+#: tools/symcryptrun.c:486
 msgid "no --program option provided\n"
 msgstr "--program diye bir seçenek yok\n"
 
-#: tools/symcryptrun.c:521
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr "sadece --decrypt ve --encrypt destekleniyor\n"
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr "--keyfile diye bir seçenek yok\n"
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr "argüman dizgeleri dizisi ayrılamıyor\n"
 
-#: tools/symcryptrun.c:556
+#: tools/symcryptrun.c:527
 #, c-format
 msgid "could not create pipe: %s\n"
 msgstr "boru oluşturulamadı: %s\n"
 
-#: tools/symcryptrun.c:563
+#: tools/symcryptrun.c:534
 #, c-format
 msgid "could not create pty: %s\n"
 msgstr "pty oluşturulamadı: %s\n"
 
-#: tools/symcryptrun.c:579
+#: tools/symcryptrun.c:550
 #, c-format
 msgid "could not fork: %s\n"
 msgstr "çatallanamadı: %s\n"
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:578
 #, c-format
 msgid "execv failed: %s\n"
 msgstr "execv başarısız: %s\n"
 
-#: tools/symcryptrun.c:636
+#: tools/symcryptrun.c:607
 #, c-format
 msgid "select failed: %s\n"
 msgstr "select başarısız: %s\n"
 
-#: tools/symcryptrun.c:653
+#: tools/symcryptrun.c:624
 #, c-format
 msgid "read failed: %s\n"
 msgstr "read başarısız: %s\n"
 
-#: tools/symcryptrun.c:705
+#: tools/symcryptrun.c:676
 #, c-format
 msgid "pty read failed: %s\n"
 msgstr "pty okuması başarısız: %s\n"
 
-#: tools/symcryptrun.c:757
+#: tools/symcryptrun.c:728
 #, c-format
 msgid "waitpid failed: %s\n"
 msgstr "waitpid başarısız: %s\n"
 
-#: tools/symcryptrun.c:771
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr "alt süreç %i durumu ile çıktı\n"
 
-#: tools/symcryptrun.c:826
+#: tools/symcryptrun.c:797
 #, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "dosya içi dizge ayrılamıyor: %s\n"
 
-#: tools/symcryptrun.c:839
+#: tools/symcryptrun.c:810
 #, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "dosya dışı dizge ayrılamıyor: %s\n"
 
-#: tools/symcryptrun.c:1014
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr "ya %s verilmeli ya da %s\n"
 
-#: tools/symcryptrun.c:1041
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr "hiç sınıf sağlanmamış\n"
 
-#: tools/symcryptrun.c:1050
+#: tools/symcryptrun.c:1021
 #, c-format
 msgid "class %s is not supported\n"
 msgstr "%s sınıfı desteklenmiyor\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "simgelem verisi v3 (PGP 2.x tarzı) imzalara konulamaz\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr "simgelem verisi v3 (PGP 2.x tarzı) anahtar imzalarına konulamaz\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "poliçe URL'si v3 (PGP 2.x tarzı) imzalara konulamaz\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr "poliçe URL'si v3 (PGP 2.x tarzı) anahtar imzalarına konulamaz\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8275205a8..b0be48d69 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.4\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-09-14 13:27+0200\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
 "PO-Revision-Date: 2006-07-02 10:58+0800\n"
 "Last-Translator: Meng Jie <zuxyhere@eastday.com>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -19,59 +19,76 @@ msgstr ""
 "X-Poedit-SourceCharset: iso-8859-1\n"
 "X-Poedit-Basepath: d:\\msys\\source\\gnupg-1.4.3\n"
 
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "无法存储指纹：%s\n"
 
-#: agent/call-pinentry.c:438
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:441
+#: agent/call-pinentry.c:551
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/call-pinentry.c:489
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+#, fuzzy
+msgid "Quality:"
+msgstr "有效性：%s"
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 #, fuzzy
 msgid "PIN too long"
 msgstr "列太长"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:668
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "列太长"
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:676
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "姓名含有无效的字符\n"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:535
+#: agent/call-pinentry.c:693
 #, fuzzy
 msgid "Bad PIN"
 msgstr "损坏的多精度整数(MPI)"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:694
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "错误的密码"
 
-#: agent/call-pinentry.c:572
+#: agent/call-pinentry.c:730
 #, fuzzy
 msgid "Passphrase"
 msgstr "错误的密码"
@@ -81,21 +98,21 @@ msgstr "错误的密码"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "不支持保护散列 %d\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
-#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1865
-#: sm/gpgsm.c:1902 sm/gpgsm.c:1940 sm/qualified.c:72
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "无法打开‘%s’： %s\n"
@@ -135,14 +152,25 @@ msgstr "写入钥匙环‘%s’时出错： %s\n"
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/command-ssh.c:2349
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "更改密码"
+
+#: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2850
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/command-ssh.c:2885
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s：建立散列表失败：%s\n"
@@ -187,76 +215,66 @@ msgstr "请输入密码\n"
 msgid "Take this one anyway"
 msgstr "无论如何还是使用这把密钥吗？(y/N)"
 
-#: agent/genkey.c:185
+#: agent/genkey.c:191
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u character long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u characters long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:202
+#: agent/genkey.c:212
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digit or special character."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digits or special characters."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:225
+#: agent/genkey.c:235
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
-"passphrase may not%0Abe a known term or match certain pattern."
+"Warning: You have entered an insecure passphrase.%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:238
+#: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:240
+#: agent/genkey.c:253
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:246
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:290
+#: agent/genkey.c:306
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "更改密码"
-
-#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
-#: tools/symcryptrun.c:456
-msgid "does not match - try again"
-msgstr ""
-
-#: agent/genkey.c:412
+#: agent/genkey.c:429
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "更改密码"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:104
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -266,66 +284,65 @@ msgstr ""
 "选项：\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:109
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:69 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "详细模式"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:341
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "尽量减少提示信息"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:112
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:113
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "从‘%s’读取选项\n"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
-#: tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "在公钥服务器上搜寻密钥"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:134
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "为所选用户标识的设定注记"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "导入后不更新信任度数据库"
@@ -363,152 +380,167 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:91 tools/symcryptrun.c:204
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
 "请向 <gnupg-bugs@gnu.org> 报告程序缺陷。\n"
 "请向 <zuxyhere@eastday.com> 反映简体中文翻译的问题。\n"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:512 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:340 sm/gpgsm.c:819 sm/gpgsm.c:822 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意：没有默认配置文件‘%s’\n"
 
-#: agent/gpg-agent.c:610 agent/gpg-agent.c:1177 g10/gpg.c:2027
-#: scd/scdaemon.c:421 sm/gpgsm.c:914 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: agent/gpg-agent.c:947 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "建立‘%s’时发生错误：%s\n"
 
-#: agent/gpg-agent.c:1247 agent/gpg-agent.c:1373 agent/gpg-agent.c:1377
-#: agent/gpg-agent.c:1418 agent/gpg-agent.c:1422 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:908
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
+#: agent/gpg-agent.c:1321
+#, c-format
+msgid "socket name `%s' is too long\n"
+msgstr ""
+
+#: agent/gpg-agent.c:1333
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
+#, fuzzy
+msgid "error getting nonce for the socket\n"
+msgstr "获取新 PIN 时出错：%s\n"
+
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 
-#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "已创建目录‘%s’\n"
 
-#: agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1448
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) 在 %s 中出错：%s\n"
 
-#: agent/gpg-agent.c:1438
+#: agent/gpg-agent.c:1452
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1549
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
+#, fuzzy, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "读取‘%s’时出错：%s\n"
+
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1554
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1571
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1576
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "更新私钥失败：%s\n"
 
-#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s：已跳过：%s\n"
 
-#: agent/gpg-agent.c:1809
+#: agent/gpg-agent.c:1850
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:756
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
 
-#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
-#: tools/gpg-connect-agent.c:767
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "不支持 gpg-agent 协议版本 %d\n"
@@ -535,40 +567,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1188
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1191
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/protect-tool.c:1216
+#: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1221
+#: agent/protect-tool.c:1199
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "错误的密码"
 
-#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "已取消"
@@ -680,7 +712,8 @@ msgstr "更改密码"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1338
+#: tools/gpgconf-comp.c:1641
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
@@ -827,75 +860,80 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:366
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII 封装：%s\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr "无效的 ASCII 封装头："
 
-#: g10/armor.c:416
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr "ASCII 封装头："
 
-#: g10/armor.c:427
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr "无效的明文签名头\n"
 
-#: g10/armor.c:479
+#: g10/armor.c:455
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "ASCII 封装头："
+
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr "多层明文签名\n"
 
-#: g10/armor.c:614
+#: g10/armor.c:643
 msgid "unexpected armor: "
 msgstr "与预期不符的 ASCII 封装："
 
-#: g10/armor.c:626
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr "以连字符开头的行格式错误："
 
-#: g10/armor.c:780 g10/armor.c:1390
+#: g10/armor.c:809 g10/armor.c:1419
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "跳过无效的 64 进制字符 %02x\n"
 
-#: g10/armor.c:823
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr "文件先于预期结束(没有 CRC 部分)\n"
 
-#: g10/armor.c:857
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr "文件先于预期结束(CRC 部分未结束)\n"
 
-#: g10/armor.c:865
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr "异常的 CRC\n"
 
-#: g10/armor.c:869 g10/armor.c:1427
+#: g10/armor.c:898 g10/armor.c:1456
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC 错误：%06lx - %06lx\n"
 
-#: g10/armor.c:889
+#: g10/armor.c:918
 msgid "premature eof (in trailer)\n"
 msgstr "文件先于预期结束(于结尾处)\n"
 
-#: g10/armor.c:893
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr "结尾行有问题\n"
 
-#: g10/armor.c:1204
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr "找不到有效的 OpenPGP 数据。\n"
 
-#: g10/armor.c:1209
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "无效的 ASCII 封装：一行超过 %d 字符\n"
 
-#: g10/armor.c:1213
+#: g10/armor.c:1242
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "封装里出现括上的可打印字符――可能是有缺陷的信件传输程序造成的\n"
@@ -1211,11 +1249,11 @@ msgstr "不允许使用管理员命令\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的指令(尝试“help”)\n"
 
-#: g10/decrypt.c:110 g10/encode.c:890
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "无法打开‘%s’\n"
@@ -1226,7 +1264,7 @@ msgstr "无法打开‘%s’\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "密钥‘%s’找不到：%s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1266,7 +1304,7 @@ msgstr "公钥“%s”有对应的私钥！\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "请先使用“--delete-secret-keys”选项来删除它。\n"
 
-#: g10/encode.c:226 g10/sign.c:1296
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
@@ -1285,7 +1323,7 @@ msgstr "使用对称加密算法 %s\n"
 msgid "`%s' already compressed\n"
 msgstr "‘%s’已被压缩\n"
 
-#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "警告：‘%s’是一个空文件\n"
@@ -1310,24 +1348,24 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告：强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
 
-#: g10/encode.c:669 g10/sign.c:966
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "警告：强行使用的 %s (%d)压缩算法不在收件者的首选项中\n"
 
-#: g10/encode.c:765
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
 
-#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "您不该将 %s 用于 %s 模式中\n"
 
-#: g10/encode.c:862
+#: g10/encode.c:848
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已经加密给：“%s”\n"
@@ -1502,7 +1540,7 @@ msgstr "使用子钥 %s 而非主钥 %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1510,132 +1548,132 @@ msgstr ""
 "@指令：\n"
 " "
 
-#: g10/gpg.c:370
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[文件名]|生成一份签名"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[文件名]|生成一份明文签名"
 
-#: g10/gpg.c:372 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "生成一份分离的签名"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "加密数据"
 
-#: g10/gpg.c:375 sm/gpgsm.c:248
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr "仅使用对称加密"
 
-#: g10/gpg.c:377 sm/gpgsm.c:249
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "解密数据(默认)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "验证签名"
 
-#: g10/gpg.c:381 sm/gpgsm.c:252
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "列出密钥"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "列出密钥和签名"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "list and check key signatures"
 msgstr "列出并检查密钥签名"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "列出密钥和指纹"
 
-#: g10/gpg.c:386 sm/gpgsm.c:254
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "列出私钥"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "生成一副新的密钥对"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "remove keys from the public keyring"
 msgstr "从公钥钥匙环里删除密钥"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "remove keys from the secret keyring"
 msgstr "从私钥钥匙环里删除密钥"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "为某把密钥添加签名"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "为某把密钥添加本地签名"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "编辑某把密钥或为其添加签名"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "生成一份吊销证书"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "导出密钥"
 
-#: g10/gpg.c:397 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "把密钥导出到某个公钥服务器上"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "从公钥服务器上导入密钥"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:402
 msgid "search for keys on a key server"
 msgstr "在公钥服务器上搜寻密钥"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "update all keys from a keyserver"
 msgstr "从公钥服务器更新所有的本地密钥"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "导入/合并密钥"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr "打印卡状态"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr "更改卡上的数据"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr "更改卡的 PIN"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr "更新信任度数据库"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
 
-#: g10/gpg.c:430 sm/gpgsm.c:264
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1645,47 +1683,48 @@ msgstr ""
 "选项：\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:281
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr "输出经 ASCII 封装"
 
-#: g10/gpg.c:436 sm/gpgsm.c:293
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: g10/gpg.c:447 sm/gpgsm.c:331
+#: g10/gpg.c:449 sm/gpgsm.c:333
 msgid "use this user-id to sign or decrypt"
 msgstr "使用这个用户标识来签名或解密"
 
-#: g10/gpg.c:448 sm/gpgsm.c:334
+#: g10/gpg.c:450 sm/gpgsm.c:336
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:336
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr "使用标准的文本模式"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
-msgid "use as output file"
-msgstr "指定输出文件"
+#: g10/gpg.c:469 sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "从‘%s’读取选项\n"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "不做任何改变"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "覆盖前先询问"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr "行为严格遵循 OpenPGP 定义"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr "生成与 PGP 2.x 兼容的报文"
 
-#: g10/gpg.c:553 sm/gpgsm.c:397
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1693,7 +1732,7 @@ msgstr ""
 "@\n"
 "(请参考在线说明以获得所有命令和选项的完整清单)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:400
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1713,17 +1752,17 @@ msgstr ""
 " --list-keys [某甲]           显示密钥\n"
 " --fingerprint [某甲]         显示指纹\n"
 
-#: g10/gpg.c:750 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "请向 <gnupg-bugs@gnu.org> 报告程序缺陷。\n"
 "请向 <zuxyhere@eastday.com> 反映简体中文翻译的问题。\n"
 
-#: g10/gpg.c:767
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1733,7 +1772,7 @@ msgstr ""
 "签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:578
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1741,540 +1780,544 @@ msgstr ""
 "\n"
 "支持的算法：\n"
 
-#: g10/gpg.c:784
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr "公钥："
 
-#: g10/gpg.c:791 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "对称加密："
 
-#: g10/gpg.c:798
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr "散列："
 
-#: g10/gpg.c:805 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "压缩："
 
-#: g10/gpg.c:875
+#: g10/gpg.c:817 sm/gpgsm.c:603
+msgid "Used libraries:"
+msgstr ""
+
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "用法：gpg [选项] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:715
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "冲突的指令\n"
 
-#: g10/gpg.c:1063
+#: g10/gpg.c:1113
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在‘%s’组定义里找不到等号(=)\n"
 
-#: g10/gpg.c:1260
+#: g10/gpg.c:1310
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1263
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1266
+#: g10/gpg.c:1316
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1272
+#: g10/gpg.c:1322
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’权限不安全\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1325
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’权限不安全\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1328
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’权限不安全\n"
 
-#: g10/gpg.c:1284
+#: g10/gpg.c:1334
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1337
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1340
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1296
+#: g10/gpg.c:1346
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1349
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1352
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1445
+#: g10/gpg.c:1495
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的配置项‘%s’\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr "列出密钥时显示用户标识"
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr "列出签名时显示策略 URL"
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1594
 msgid "show all notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr "列出签名时显示用户提供的注记"
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1602
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出密钥时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr "列出密钥时显示用户标识的有效性"
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出密钥时显示已吊销或已过期的用户标识"
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1610
 msgid "show the keyring name in key listings"
 msgstr "列出密钥时显示钥匙环的名称"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1612
 msgid "show expiration dates during signature listings"
 msgstr "列出签名时显示过期日期"
 
-#: g10/gpg.c:1825
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1981
+#: g10/gpg.c:2030
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
 
-#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "注意：一般情况下不会用到 %s！\n"
 
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "‘%s’不是一个有效的签名过期日期\n"
 
-#: g10/gpg.c:2493
+#: g10/gpg.c:2565
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: g10/gpg.c:2528
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2603
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2610
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2613
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2620
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/gpg.c:2551
+#: g10/gpg.c:2623
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2630
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/gpg.c:2561
+#: g10/gpg.c:2633
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr "验证签名时显示照片标识"
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr "验证签名时显示策略 URL"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2645
 msgid "show all notations during signature verification"
 msgstr "验证签名时显示所有注记"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr "验证签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr "验证签名时显示用户提供的注记"
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2653
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "验证签名时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2655
 msgid "show user ID validity during signature verification"
 msgstr "验证签名时显示用户标识的有效性"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2659
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr "使用 PKA 数据验证签名的有效性"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "提升带有有效 PKA 数据的签名的信任度"
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2670
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s：%d：无效的校验选项\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2673
 msgid "invalid verify options\n"
 msgstr "无效的校验选项\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法把运行路径设成 %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2855
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s：%d：无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr "无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1298
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程序可能会创建核心内存转储！\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 会使得 %s 失效\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不可与 %s 并用\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用无意义！\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2975
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下时，不能同时签名和加密\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:3014
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1370
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1378
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3092
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3098
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的证书散列算法无效\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr "需要的完全可信签名数一定要大于 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需要的勉强可信签名数一定要大于 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3117
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "最大验证深度一定要介于 1 和 255 之间\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3119
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3121
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3135
 msgid "invalid default preferences\n"
 msgstr "无效的默认首选项\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3144
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人对称加密算法首选项\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3148
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人散列算法首选项\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3152
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3185
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚不能和 %s 并用\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3232
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3237
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3242
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "初始化信任度数据库失败：%s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [文件名]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [文件名]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3375
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [文件名]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3398
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [文件名]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--sign [文件名]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [文件名]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3449
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [文件名]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3454
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3474
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [文件名]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [文件名]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [文件名]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key 用户标识"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 用户标识"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 用户标识 [指令]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "上传至公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥服务器接收失败：%s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3630
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3641
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "搜寻公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3651
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "从公钥服务器更新失败：%s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "无效的‘%s’散列算法\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[文件名]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始键入您的报文……\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4233
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的验证策略 URL 无效\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4235
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签名策略 URL 无效\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4268
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
@@ -2286,7 +2329,7 @@ msgstr "从这个钥匙环里取用密钥"
 msgid "make timestamp conflicts only a warning"
 msgstr "把时间戳矛盾仅视为警告"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:372
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr "|FD|把状态信息写入文件描述符 FD"
 
@@ -2796,13 +2839,13 @@ msgstr "密钥 %s：新密钥――已跳过\n"
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可写的钥匙环：%s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在写入‘%s’\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2369 g10/import.c:2391
+#: g10/import.c:2381 g10/import.c:2403
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "写入钥匙环‘%s’时出错： %s\n"
@@ -2891,7 +2934,7 @@ msgstr "密钥 %s：私钥使用了无效的加密算法 %d――已跳过\n"
 msgid "importing secret keys not allowed\n"
 msgstr "不允许导入私钥\n"
 
-#: g10/import.c:1158 g10/import.c:2384
+#: g10/import.c:1158 g10/import.c:2396
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "没有默认的私钥钥匙环： %s\n"
@@ -3015,40 +3058,40 @@ msgstr "密钥 %s：子钥签名位置错误――已跳过\n"
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "密钥 %s：与预期不符的签名验证级别(0x%02X)――已跳过\n"
 
-#: g10/import.c:1732
+#: g10/import.c:1744
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "密钥 %s：检测到重复的用户标识――已合并\n"
 
-#: g10/import.c:1794
+#: g10/import.c:1806
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告：密钥 %s 可能已被吊销：正在取回吊销密钥 %s\n"
 
-#: g10/import.c:1808
+#: g10/import.c:1820
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告：密钥 %s 可能已被吊销：吊销密钥 %s 不存在。\n"
 
-#: g10/import.c:1867
+#: g10/import.c:1879
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "密钥 %s：已新增吊销证书“%s”\n"
 
-#: g10/import.c:1901
+#: g10/import.c:1913
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "密钥 %s：已新增直接密钥签名\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2302
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "注意：密钥的序列号与卡的不符\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2310
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "注意：主钥在线，存储在卡上\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2312
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "注意：子钥在线，存储在卡上\n"
 
@@ -3340,7 +3383,7 @@ msgid "Really sign? (y/N) "
 msgstr "真的要签名吗？(y/N)"
 
 #: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:348
+#: g10/keyedit.c:5019 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "签名时失败： %s\n"
@@ -3671,8 +3714,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "您真的要吊销这把子钥吗？(y/N)"
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n"
 
 #: g10/keyedit.c:2140
@@ -4521,13 +4563,13 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "生成密钥失败：%s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:273
+#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:275
+#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5112,17 +5154,17 @@ msgstr "不压缩"
 msgid "uncompressed|none"
 msgstr "未压缩|无"
 
-#: g10/misc.c:874
+#: g10/misc.c:891
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "%s 也许不能使用这个报文\n"
 
-#: g10/misc.c:1049
+#: g10/misc.c:1066
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "有歧义的选项‘%s’\n"
 
-#: g10/misc.c:1074
+#: g10/misc.c:1091
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "未知的选项 '%s'\n"
@@ -5178,12 +5220,12 @@ msgstr "警告：潜在不安全的对称加密会话密钥\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 类别的子包设定了关键位\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:603
+#: g10/passphrase.c:295 g10/passphrase.c:581
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主钥匙号 %s)"
 
-#: g10/passphrase.c:327
+#: g10/passphrase.c:309
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5194,36 +5236,36 @@ msgstr ""
 "“%.*s”\n"
 "%u 位的 %s 密钥，钥匙号 %s，建立于 %s%s\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:334
 msgid "Repeat passphrase\n"
 msgstr "请再输入一次密码\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:336
 msgid "Enter passphrase\n"
 msgstr "请输入密码\n"
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:363
 msgid "cancelled by user\n"
 msgstr "用户取消\n"
 
-#: g10/passphrase.c:384 g10/passphrase.c:450
+#: g10/passphrase.c:369 g10/passphrase.c:428
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "代理程序有问题――正在停用代理程序\n"
 
-#: g10/passphrase.c:582
+#: g10/passphrase.c:560
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
 "user: \"%s\"\n"
 msgstr "您需要输入密码，才能解开这个用户的私钥：“%s”\n"
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:568
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u 位的 %s 密钥，钥匙号 %s，建立于 %s"
 
-#: g10/passphrase.c:599
+#: g10/passphrase.c:577
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (主钥 %s 的子钥)"
@@ -5827,69 +5869,53 @@ msgstr "密钥 %s：没有子钥吊销签名所需的子钥\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "密钥 %s：没有子钥绑定签名所需的子钥\n"
 
-#: g10/sign.c:82
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "无法在 v3 (PGP 2.x样式)的签名内放入注记数据\n"
-
-#: g10/sign.c:90
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "无法在 v3 (PGP 2.x样式)的密钥签名内放入注记数据\n"
-
-#: g10/sign.c:104
+#: g10/sign.c:89
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr "警告：注记 %% 无法扩展(太大了)。现在使用未扩展的。\n"
 
-#: g10/sign.c:121
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "无法在 v3 (PGP 2.x样式)的签名内放入策略 URL\n"
-
-#: g10/sign.c:129
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr "无法在 v3 (PGP 2.x样式)的密钥签名内放入策略 URL\n"
-
-#: g10/sign.c:142
+#: g10/sign.c:115
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "警告：无法 %%-扩展策略 URL (太大了)。现在使用未扩展的。\n"
 
-#: g10/sign.c:170
+#: g10/sign.c:138
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr "警告：无法 %%-扩展首选公钥服务器 URL (太大了)。现在使用未扩展的。\n"
 
-#: g10/sign.c:343
+#: g10/sign.c:311
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "检查已建立的签名时发生错误： %s\n"
 
-#: g10/sign.c:352
+#: g10/sign.c:320
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 签名来自：“%s”\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做分离签名\n"
 
-#: g10/sign.c:864
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告：强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
 
-#: g10/sign.c:991
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "正在签名："
 
-#: g10/sign.c:1106
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做明文签名\n"
 
-#: g10/sign.c:1290
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密将被采用\n"
@@ -6587,61 +6613,61 @@ msgstr "目前禁止通过此命令验证管理员 PIN\n"
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:114 sm/gpgsm.c:361
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 #, fuzzy
 msgid "read options from file"
 msgstr "从‘%s’读取选项\n"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:122
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:123
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:126
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:135
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "显示管理员命令"
 
-#: scd/scdaemon.c:209
+#: scd/scdaemon.c:210
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: scd/scdaemon.c:211
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:658
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1006
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1011
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6675,11 +6701,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1631
+#: sm/certchain.c:195 sm/certchain.c:1646
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1631
+#: sm/certchain.c:196 sm/certchain.c:1646
 msgid "shell"
 msgstr ""
 
@@ -6719,8 +6745,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "无法存储密钥：%s\n"
@@ -6889,7 +6915,7 @@ msgstr ""
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1730
+#: sm/certchain.c:1462 sm/certchain.c:1745
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "首选项‘%s’重复\n"
@@ -6904,11 +6930,11 @@ msgstr "已建立吊销证书。\n"
 msgid "root certificate is good\n"
 msgstr "证书已损坏"
 
-#: sm/certchain.c:1620
+#: sm/certchain.c:1635
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1629
+#: sm/certchain.c:1644
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -6923,7 +6949,7 @@ msgstr "DSA 密钥 %s 使用不安全的(%u 位)的散列\n"
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6937,25 +6963,25 @@ msgstr "no"
 msgid "[none]"
 msgstr "[未设定]"
 
-#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
+#: sm/certdump.c:583 sm/certdump.c:628 sm/certdump.c:693 sm/certdump.c:746
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "错误：无效的响应。\n"
 
-#: sm/certdump.c:558 sm/certdump.c:603
+#: sm/certdump.c:591 sm/certdump.c:636
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:640 sm/certdump.c:696
+#: sm/certdump.c:673 sm/certdump.c:729
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:665 sm/certdump.c:719
+#: sm/certdump.c:698 sm/certdump.c:752
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "错误：无效的响应。\n"
 
-#: sm/certdump.c:936
+#: sm/certdump.c:946
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7082,190 +7108,199 @@ msgstr "删除密钥区块时失败：%s\n"
 msgid "no valid recipients given\n"
 msgstr "(不给定描述)\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[文件名]|生成一份签名"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[文件名]|生成一份明文签名"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list external keys"
 msgstr "列出私钥"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
 #, fuzzy
 msgid "list certificate chain"
 msgstr "证书已损坏"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "从公钥钥匙环里删除密钥"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "import certificates"
 msgstr "证书已损坏"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "export certificates"
 msgstr "证书已损坏"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "register a smartcard"
 msgstr "在智能卡上添加一把密钥"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:270
 #, fuzzy
 msgid "change a passphrase"
 msgstr "更改密码"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "输出经 ASCII 封装"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "已跳过：公钥已被设为默认收件者\n"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:345
+msgid "|FILE|write a server mode log to FILE"
+msgstr ""
+
+#: sm/gpgsm.c:347
+#, fuzzy
+msgid "|FILE|write an audit log to FILE"
+msgstr "从‘%s’读取选项\n"
+
+#: sm/gpgsm.c:349
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "检查签名"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:359
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "从这个钥匙环里取用密钥"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:360
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "要有私钥才能这么做。\n"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:363
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:379
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:388
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "未知的对称加密算法"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:390
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s 签名，散列算法 %s\n"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:392
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "未知的压缩算法"
 
-#: sm/gpgsm.c:568
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: sm/gpgsm.c:571
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7276,36 +7311,36 @@ msgstr ""
 "签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: sm/gpgsm.c:650
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "用法：gpg [选项] "
 
-#: sm/gpgsm.c:748
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "无法连接至‘%s’：%s\n"
 
-#: sm/gpgsm.c:759
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "未知的选项 '%s'\n"
 
-#: sm/gpgsm.c:1315
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1411
+#: sm/gpgsm.c:1468
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1429
+#: sm/gpgsm.c:1486
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "无法存取‘%s’：%s\n"
 
-#: sm/gpgsm.c:1612
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7328,7 +7363,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:1274
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
@@ -7391,17 +7426,17 @@ msgstr "读取‘%s’时出错：%s\n"
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:111
+#: sm/qualified.c:105
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "错误：指纹格式无效。\n"
 
-#: sm/qualified.c:129
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:225
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7412,13 +7447,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234 sm/verify.c:536
+#: sm/qualified.c:209 sm/verify.c:580
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:327
+#: sm/qualified.c:277
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7431,290 +7466,308 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "检查已建立的签名时发生错误： %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:424
 #, fuzzy
 msgid "Signature made "
 msgstr "签名建立于 %s\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:428
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:429
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: sm/verify.c:514
+#: sm/verify.c:558
 #, fuzzy
 msgid "Good signature from"
 msgstr "完好的签名，来自于“%s”"
 
-#: sm/verify.c:515
+#: sm/verify.c:559
 #, fuzzy
 msgid "                aka"
 msgstr "              亦即“%s”"
 
-#: sm/verify.c:533
+#: sm/verify.c:577
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "这将是一个自身签名。\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "quit"
 
-#: tools/gpg-connect-agent.c:60
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:127
+#: tools/gpg-connect-agent.c:74
+#, fuzzy
+msgid "|FILE|run commands from FILE on startup"
+msgstr "从‘%s’读取选项\n"
+
+#: tools/gpg-connect-agent.c:75
+msgid "run /subst on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:174
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: tools/gpg-connect-agent.c:130
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:314
+#: tools/gpg-connect-agent.c:1155
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:323
+#: tools/gpg-connect-agent.c:1164
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:381
+#: tools/gpg-connect-agent.c:1219 tools/gpg-connect-agent.c:1645
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "无法读出公钥：%s\n"
+
+#: tools/gpg-connect-agent.c:1299
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "列太长"
 
-#: tools/gpg-connect-agent.c:385
+#: tools/gpg-connect-agent.c:1303
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:1619
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "未知的选项 '%s'\n"
 
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:1637
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "签名时失败： %s\n"
 
-#: tools/gpg-connect-agent.c:473
-#, fuzzy, c-format
-msgid "receiving line failed: %s\n"
-msgstr "无法读出公钥：%s\n"
-
-#: tools/gpg-connect-agent.c:789
+#: tools/gpg-connect-agent.c:1986
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: tools/gpg-connect-agent.c:798
+#: tools/gpg-connect-agent.c:1995
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 
-#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
-#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
+#: tools/gpgconf-comp.c:459 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:773
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:796
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
-#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
+#: tools/gpgconf-comp.c:482 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:803
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
-#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:487 tools/gpgconf-comp.c:606 tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:729 tools/gpgconf-comp.c:811
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:737
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:504
+#: tools/gpgconf-comp.c:502
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:506
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:512
+#: tools/gpgconf-comp.c:510
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:526
+#: tools/gpgconf-comp.c:524
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:527
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:531
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:535
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:539
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:543
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "从导出的子钥中删除所有密码"
 
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:547
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:710
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:669
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:674
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:719
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:744
+#: tools/gpgconf-comp.c:742
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:786
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:824
+#: tools/gpgconf-comp.c:822
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:834
+#: tools/gpgconf-comp.c:832
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:845
+#: tools/gpgconf-comp.c:843
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:850
+#: tools/gpgconf-comp.c:848
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:887
+#: tools/gpgconf-comp.c:885
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2982
+#: tools/gpgconf-comp.c:3006
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:59
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
+#, fuzzy
+msgid "list global configuration file"
+msgstr "未知的配置项‘%s’\n"
+
+#: tools/gpgconf.c:67
 #, fuzzy
 msgid "check global configuration file"
 msgstr "未知的配置项‘%s’\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:71
+msgid "use as output file"
+msgstr "指定输出文件"
+
+#: tools/gpgconf.c:75
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:100
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:176 tools/gpgconf.c:209
+#: tools/gpgconf.c:202 tools/gpgconf.c:240
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "用法：gpg [选项] "
 
-#: tools/gpgconf.c:178
+#: tools/gpgconf.c:204
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:187
+#: tools/gpgconf.c:213
 #, fuzzy
 msgid "Component not found"
 msgstr "找不到公钥"
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:242
 #, fuzzy
 msgid "No argument allowed"
 msgstr "不允许使用管理员命令\n"
@@ -7808,92 +7861,104 @@ msgstr "读取‘%s’时出错：%s\n"
 msgid "error closing %s: %s\n"
 msgstr "‘%s’中出错：%s\n"
 
-#: tools/symcryptrun.c:515
+#: tools/symcryptrun.c:486
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "不支持远程调用\n"
 
-#: tools/symcryptrun.c:521
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:556
+#: tools/symcryptrun.c:527
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: tools/symcryptrun.c:563
+#: tools/symcryptrun.c:534
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: tools/symcryptrun.c:579
+#: tools/symcryptrun.c:550
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:578
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: tools/symcryptrun.c:636
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "删除密钥区块时失败：%s\n"
 
-#: tools/symcryptrun.c:653
+#: tools/symcryptrun.c:624
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: tools/symcryptrun.c:705
+#: tools/symcryptrun.c:676
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: tools/symcryptrun.c:757
+#: tools/symcryptrun.c:728
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: tools/symcryptrun.c:771
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:826
+#: tools/symcryptrun.c:797
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: tools/symcryptrun.c:839
+#: tools/symcryptrun.c:810
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: tools/symcryptrun.c:1014
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1041
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1050
+#: tools/symcryptrun.c:1021
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "不支持保护散列 %d\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "无法在 v3 (PGP 2.x样式)的签名内放入注记数据\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr "无法在 v3 (PGP 2.x样式)的密钥签名内放入注记数据\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "无法在 v3 (PGP 2.x样式)的签名内放入策略 URL\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr "无法在 v3 (PGP 2.x样式)的密钥签名内放入策略 URL\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2cb01ef09..daa1f9bd5 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-09-14 13:27+0200\n"
+"POT-Creation-Date: 2007-11-19 16:02+0100\n"
 "PO-Revision-Date: 2005-07-29 09:49+0800\n"
 "Last-Translator: Jedi <Jedi@Jedi.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -17,59 +17,76 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:196
+#: agent/call-pinentry.c:205
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "存放指紋失敗: %s\n"
 
-#: agent/call-pinentry.c:438
+#: agent/call-pinentry.c:548
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:441
+#: agent/call-pinentry.c:551
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: agent/call-pinentry.c:489
+#. TRANSLATORS: This string is displayed pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:586
+#, fuzzy
+msgid "Quality:"
+msgstr "有效性: %s"
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar.  Please use an appropriate
+#. sting to describe what this is about.  The length of the
+#. tooltip is limited to about 900 characters.  If you do not
+#. translate this a default english string (see source) will be
+#. used.
+#: agent/call-pinentry.c:604
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:647
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
+#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
 #, fuzzy
 msgid "PIN too long"
 msgstr "列太長"
 
-#: agent/call-pinentry.c:510
+#: agent/call-pinentry.c:668
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "列太長"
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:676
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "姓名含有無效的字符\n"
 
-#: agent/call-pinentry.c:523
+#: agent/call-pinentry.c:681
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:535
+#: agent/call-pinentry.c:693
 #, fuzzy
 msgid "Bad PIN"
 msgstr "損壞的 MPI"
 
-#: agent/call-pinentry.c:536
+#: agent/call-pinentry.c:694
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "錯誤的密語"
 
-#: agent/call-pinentry.c:572
+#: agent/call-pinentry.c:730
 #, fuzzy
 msgid "Passphrase"
 msgstr "錯誤的密語"
@@ -79,21 +96,21 @@ msgstr "錯誤的密語"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "保護摘要 %d 未被支援\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1009 g10/keygen.c:3141
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1059 g10/keygen.c:3141
 #: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:828 g10/sign.c:1137 g10/tdbio.c:536
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "無法建立 `%s': %s\n"
 
 #: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1010 g10/import.c:193 g10/keygen.c:2630
+#: g10/encode.c:504 g10/gpg.c:1060 g10/import.c:193 g10/keygen.c:2630
 #: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:810 g10/sign.c:1005 g10/sign.c:1121
-#: g10/sign.c:1277 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1865
-#: sm/gpgsm.c:1902 sm/gpgsm.c:1940 sm/qualified.c:72
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1939
+#: sm/gpgsm.c:1976 sm/gpgsm.c:2014 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
@@ -133,14 +150,25 @@ msgstr "寫到鑰匙圈 `%s' 時發生錯誤: %s\n"
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: agent/command-ssh.c:2349
+#: agent/command-ssh.c:2342 agent/genkey.c:308 agent/genkey.c:430
+#: agent/protect-tool.c:1197
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "更改密語"
+
+#: agent/command-ssh.c:2363
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2850
+#: agent/command-ssh.c:2401 agent/genkey.c:338 agent/genkey.c:461
+#: agent/protect-tool.c:1203 tools/symcryptrun.c:434
+msgid "does not match - try again"
+msgstr ""
+
+#: agent/command-ssh.c:2885
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: 建立雜湊表失敗: %s\n"
@@ -185,76 +213,66 @@ msgstr "請輸入密語\n"
 msgid "Take this one anyway"
 msgstr "無論如何還是使用這把金鑰嗎? (y/N) "
 
-#: agent/genkey.c:185
+#: agent/genkey.c:191
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u character long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Abe at least %u characters long."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:202
+#: agent/genkey.c:212
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digit or special character."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
-"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
-"passphrase should%%0Acontain at least %u digits or special characters."
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:225
+#: agent/genkey.c:235
 #, c-format
 msgid ""
-"Warning:  You have entered a passphrase that%0Ais obviously not secure.  A "
-"passphrase may not%0Abe a known term or match certain pattern."
+"Warning: You have entered an insecure passphrase.%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:238
+#: agent/genkey.c:251
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:240
+#: agent/genkey.c:253
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:246
+#: agent/genkey.c:262
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:290
+#: agent/genkey.c:306
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "妳需要一個密語來保護妳的私鑰.\n"
 "\n"
 
-#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "更改密語"
-
-#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
-#: tools/symcryptrun.c:456
-msgid "does not match - try again"
-msgstr ""
-
-#: agent/genkey.c:412
+#: agent/genkey.c:429
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "更改密語"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:104
+#: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: scd/scdaemon.c:101
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -264,66 +282,65 @@ msgstr ""
 "選項:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:119 scd/scdaemon.c:103
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:109
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:340 tools/gpg-connect-agent.c:58
-#: tools/gpgconf.c:69 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:121 g10/gpg.c:471 g10/gpgv.c:70 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "囉唆模式"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:341
+#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:343
 msgid "be somewhat more quiet"
 msgstr "盡量安靜些"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:112
+#: agent/gpg-agent.c:123 scd/scdaemon.c:109
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:113
+#: agent/gpg-agent.c:124 scd/scdaemon.c:110
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "從 `%s' 讀取選項\n"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:130 scd/scdaemon.c:119
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:131
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
-#: tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "在某個金鑰伺服器上搜尋金鑰"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:134
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "設定所選使用者 ID 的偏好清單"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:137
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:141
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "更新信任資料庫"
@@ -361,150 +378,165 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:273 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:206 sm/gpgsm.c:565 tools/gpg-connect-agent.c:124
-#: tools/gpgconf.c:91 tools/symcryptrun.c:204
+#: agent/gpg-agent.c:282 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "請向 <gnupg-bugs@gnu.org> 回報程式瑕疵.\n"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:285
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:287
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:322 g10/gpg.c:966 scd/scdaemon.c:247 sm/gpgsm.c:732
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:512 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:340 sm/gpgsm.c:819 sm/gpgsm.c:822 tools/symcryptrun.c:1026
+#: agent/gpg-agent.c:521 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: scd/scdaemon.c:342 sm/gpgsm.c:873 sm/gpgsm.c:876 tools/symcryptrun.c:997
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:620 g10/gpg.c:2072 scd/scdaemon.c:423 sm/gpgsm.c:964
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
-#: agent/gpg-agent.c:610 agent/gpg-agent.c:1177 g10/gpg.c:2027
-#: scd/scdaemon.c:421 sm/gpgsm.c:914 tools/symcryptrun.c:959
+#: agent/gpg-agent.c:625 agent/gpg-agent.c:1205 g10/gpg.c:2076
+#: scd/scdaemon.c:428 sm/gpgsm.c:968 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:633 g10/gpg.c:2083 scd/scdaemon.c:436 sm/gpgsm.c:975
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項\n"
 
-#: agent/gpg-agent.c:947 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:965 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "建立 `%s' 時發生錯誤: %s\n"
 
-#: agent/gpg-agent.c:1247 agent/gpg-agent.c:1373 agent/gpg-agent.c:1377
-#: agent/gpg-agent.c:1418 agent/gpg-agent.c:1422 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:908
+#: agent/gpg-agent.c:1275 agent/gpg-agent.c:1387 agent/gpg-agent.c:1391
+#: agent/gpg-agent.c:1432 agent/gpg-agent.c:1436 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:921
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "無法建立目錄 `%s': %s\n"
 
-#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1289 scd/scdaemon.c:935
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1312 scd/scdaemon.c:958
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "無法建立 `%s': %s\n"
 
-#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
+#: agent/gpg-agent.c:1321
+#, c-format
+msgid "socket name `%s' is too long\n"
+msgstr ""
+
+#: agent/gpg-agent.c:1333
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent 在此階段無法使用\n"
 
-#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1344 scd/scdaemon.c:978
+#, fuzzy
+msgid "error getting nonce for the socket\n"
+msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
+
+#: agent/gpg-agent.c:1349 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
 
-#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1361 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:997
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "正在將私鑰寫至 `%s'\n"
 
-#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
+#: agent/gpg-agent.c:1395 agent/gpg-agent.c:1442 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "目錄 `%s' 已建立\n"
 
-#: agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1448
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) 失敗於 %s: %s\n"
 
-#: agent/gpg-agent.c:1438
+#: agent/gpg-agent.c:1452
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "無法建立目錄 `%s': %s\n"
 
-#: agent/gpg-agent.c:1549
+#: agent/gpg-agent.c:1562 scd/scdaemon.c:1013
+#, fuzzy, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "讀取 `%s' 時發生錯誤: %s\n"
+
+#: agent/gpg-agent.c:1584
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1554
+#: agent/gpg-agent.c:1589
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1571
+#: agent/gpg-agent.c:1609
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1576
+#: agent/gpg-agent.c:1614
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1718 scd/scdaemon.c:1135
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "更新私鑰失敗: %s\n"
 
-#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1827 scd/scdaemon.c:1202
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: 已跳過: %s\n"
 
-#: agent/gpg-agent.c:1809
+#: agent/gpg-agent.c:1850
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent 在此階段無法使用\n"
 
-#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
-#: tools/gpg-connect-agent.c:756
+#: agent/gpg-agent.c:1861 common/simple-pwquery.c:329
+#: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "被變造的 GPG_AGENT_INFO 環境變數\n"
 
-#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
-#: tools/gpg-connect-agent.c:767
+#: agent/gpg-agent.c:1874 common/simple-pwquery.c:341
+#: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent 協定版本 %d 未被支援\n"
@@ -531,40 +563,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1210
+#: agent/protect-tool.c:1188
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: agent/protect-tool.c:1213
+#: agent/protect-tool.c:1191
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: agent/protect-tool.c:1216
+#: agent/protect-tool.c:1194
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1221
+#: agent/protect-tool.c:1199
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "錯誤的密語"
 
-#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1215 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "已取消"
@@ -676,7 +708,8 @@ msgstr "更改密語"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
+#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1338
+#: tools/gpgconf-comp.c:1641
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
@@ -823,75 +856,80 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: g10/armor.c:366
+#: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
 msgstr "封裝: %s\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:418
 msgid "invalid armor header: "
 msgstr "無效的封裝檔頭: "
 
-#: g10/armor.c:416
+#: g10/armor.c:429
 msgid "armor header: "
 msgstr "封裝檔頭: "
 
-#: g10/armor.c:427
+#: g10/armor.c:442
 msgid "invalid clearsig header\n"
 msgstr "無效的明文簽章檔頭\n"
 
-#: g10/armor.c:479
+#: g10/armor.c:455
+#, fuzzy
+msgid "unknown armor header: "
+msgstr "封裝檔頭: "
+
+#: g10/armor.c:508
 msgid "nested clear text signatures\n"
 msgstr "多層明文簽章\n"
 
-#: g10/armor.c:614
+#: g10/armor.c:643
 msgid "unexpected armor: "
 msgstr "未預期的封裝: "
 
-#: g10/armor.c:626
+#: g10/armor.c:655
 msgid "invalid dash escaped line: "
 msgstr "無效的破折號逸出列: "
 
-#: g10/armor.c:780 g10/armor.c:1390
+#: g10/armor.c:809 g10/armor.c:1419
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "無效的 64 進位字符 %02x 被跳過了\n"
 
-#: g10/armor.c:823
+#: g10/armor.c:852
 msgid "premature eof (no CRC)\n"
 msgstr "檔案未預期的結束 (沒有 CRC 的部分)\n"
 
-#: g10/armor.c:857
+#: g10/armor.c:886
 msgid "premature eof (in CRC)\n"
 msgstr "檔案未預期的結束 (CRC 的部分未結束)\n"
 
-#: g10/armor.c:865
+#: g10/armor.c:894
 msgid "malformed CRC\n"
 msgstr "CRC 被變造過\n"
 
-#: g10/armor.c:869 g10/armor.c:1427
+#: g10/armor.c:898 g10/armor.c:1456
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC 錯誤; %06lX - %06lX\n"
 
-#: g10/armor.c:889
+#: g10/armor.c:918
 msgid "premature eof (in trailer)\n"
 msgstr "檔案未預期的結束 (於結尾處)\n"
 
-#: g10/armor.c:893
+#: g10/armor.c:922
 msgid "error in trailer line\n"
 msgstr "結尾列有問題\n"
 
-#: g10/armor.c:1204
+#: g10/armor.c:1233
 msgid "no valid OpenPGP data found.\n"
 msgstr "找不到有效的 OpenPGP 資料.\n"
 
-#: g10/armor.c:1209
+#: g10/armor.c:1238
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "無效的封裝: 列長超出 %d 字符\n"
 
-#: g10/armor.c:1213
+#: g10/armor.c:1242
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "封裝裡出現被引號括住的可列印字符 - 可能是有瑕疵的送信程式造成的\n"
@@ -1206,11 +1244,11 @@ msgstr "未允許使用管理者指令\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無效的指令  (試試看 \"help\")\n"
 
-#: g10/decrypt.c:110 g10/encode.c:890
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個命令中沒有作用\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3931 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "無法開啟 `%s'\n"
@@ -1221,7 +1259,7 @@ msgstr "無法開啟 `%s'\n"
 msgid "key \"%s\" not found: %s\n"
 msgstr "金鑰 \"%s\" 找不到: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2355 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1261,7 +1299,7 @@ msgstr "公鑰 \"%s\" 有相對應的私鑰!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
 
-#: g10/encode.c:226 g10/sign.c:1296
+#: g10/encode.c:226 g10/sign.c:1266
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
@@ -1280,7 +1318,7 @@ msgstr "正在使用編密法 %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' 已經被壓縮了\n"
 
-#: g10/encode.c:311 g10/encode.c:625 g10/sign.c:593
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "警告: `%s' 是一個空檔案\n"
@@ -1305,24 +1343,24 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用對稱式編密法 %s (%d) 會違反收件者偏好設定\n"
 
-#: g10/encode.c:669 g10/sign.c:966
+#: g10/encode.c:655 g10/sign.c:936
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "警告: 強迫使用壓縮演算法 %s (%d) 會違反收件者偏好設定\n"
 
-#: g10/encode.c:765
+#: g10/encode.c:751
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
 
-#: g10/encode.c:835 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "妳不能夠將 %s 用於 %s 模式中\n"
 
-#: g10/encode.c:862
+#: g10/encode.c:848
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已經加密給: \"%s\"\n"
@@ -1501,7 +1539,7 @@ msgstr "正在使用次鑰 %s 來替換主鑰 %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "金鑰 %s: 祇有私鑰而沒有公鑰 - 已跳過\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:55
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1509,132 +1547,132 @@ msgstr ""
 "@指令:\n"
 " "
 
-#: g10/gpg.c:370
+#: g10/gpg.c:372
 msgid "|[file]|make a signature"
 msgstr "|[檔案]|建立一份簽章"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:373
 msgid "|[file]|make a clear text signature"
 msgstr "|[檔案]|建立一份明文簽章"
 
-#: g10/gpg.c:372 sm/gpgsm.c:246
+#: g10/gpg.c:374 sm/gpgsm.c:248
 msgid "make a detached signature"
 msgstr "建立一份分離式簽章"
 
-#: g10/gpg.c:373 sm/gpgsm.c:247
+#: g10/gpg.c:375 sm/gpgsm.c:249
 msgid "encrypt data"
 msgstr "加密資料"
 
-#: g10/gpg.c:375 sm/gpgsm.c:248
+#: g10/gpg.c:377 sm/gpgsm.c:250
 msgid "encryption only with symmetric cipher"
 msgstr "僅使用對稱式編密法來加密"
 
-#: g10/gpg.c:377 sm/gpgsm.c:249
+#: g10/gpg.c:379 sm/gpgsm.c:251
 msgid "decrypt data (default)"
 msgstr "資料解密 (預設)"
 
-#: g10/gpg.c:379 sm/gpgsm.c:250
+#: g10/gpg.c:381 sm/gpgsm.c:252
 msgid "verify a signature"
 msgstr "驗證某份簽章"
 
-#: g10/gpg.c:381 sm/gpgsm.c:252
+#: g10/gpg.c:383 sm/gpgsm.c:254
 msgid "list keys"
 msgstr "列出金鑰"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:385
 msgid "list keys and signatures"
 msgstr "列出金鑰和簽章"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:386
 msgid "list and check key signatures"
 msgstr "列出並檢查金鑰簽章"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:387 sm/gpgsm.c:258
 msgid "list keys and fingerprints"
 msgstr "列出金鑰和指紋"
 
-#: g10/gpg.c:386 sm/gpgsm.c:254
+#: g10/gpg.c:388 sm/gpgsm.c:256
 msgid "list secret keys"
 msgstr "列出私鑰"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "generate a new key pair"
 msgstr "產生一份新的金鑰對"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "remove keys from the public keyring"
 msgstr "從公鑰鑰匙圈裡移去金鑰"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "remove keys from the secret keyring"
 msgstr "從私鑰鑰匙圈裡移去金鑰"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "sign a key"
 msgstr "簽署某把金鑰"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:394
 msgid "sign a key locally"
 msgstr "僅在本地簽署某把金鑰"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "sign or edit a key"
 msgstr "簽署或編輯某把金鑰"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:396
 msgid "generate a revocation certificate"
 msgstr "產生一份撤銷憑證"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:398
 msgid "export keys"
 msgstr "匯出金鑰"
 
-#: g10/gpg.c:397 sm/gpgsm.c:259
+#: g10/gpg.c:399 sm/gpgsm.c:261
 msgid "export keys to a key server"
 msgstr "把金鑰匯出至某個金鑰伺服器上"
 
-#: g10/gpg.c:398 sm/gpgsm.c:260
+#: g10/gpg.c:400 sm/gpgsm.c:262
 msgid "import keys from a key server"
 msgstr "從某個金鑰伺服器上匯入金鑰"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:402
 msgid "search for keys on a key server"
 msgstr "在某個金鑰伺服器上搜尋金鑰"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:404
 msgid "update all keys from a keyserver"
 msgstr "從某個金鑰伺服器上更新所有的金鑰"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "import/merge keys"
 msgstr "匯入/合併金鑰"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:411
 msgid "print the card status"
 msgstr "列印卡片狀態"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:412
 msgid "change data on a card"
 msgstr "變更卡片上的資料"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:413
 msgid "change a card's PIN"
 msgstr "變更某張卡片的個人識別碼 (PIN)"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:422
 msgid "update the trust database"
 msgstr "更新信任資料庫"
 
-#: g10/gpg.c:427
+#: g10/gpg.c:429
 msgid "|algo [files]|print message digests"
 msgstr "|演算法 [檔案]|印出訊息摘要"
 
-#: g10/gpg.c:430 sm/gpgsm.c:264
+#: g10/gpg.c:432 sm/gpgsm.c:266
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:279
-#: tools/gpg-connect-agent.c:56 tools/gpgconf.c:66 tools/symcryptrun.c:157
+#: g10/gpg.c:434 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1644,47 +1682,48 @@ msgstr ""
 "選項:\n"
 " "
 
-#: g10/gpg.c:434 sm/gpgsm.c:281
+#: g10/gpg.c:436 sm/gpgsm.c:283
 msgid "create ascii armored output"
 msgstr "建立以 ASCII 封裝過的輸出"
 
-#: g10/gpg.c:436 sm/gpgsm.c:293
+#: g10/gpg.c:438 sm/gpgsm.c:295
 msgid "|NAME|encrypt for NAME"
 msgstr "|名字|以「名字」作為加密對象"
 
-#: g10/gpg.c:447 sm/gpgsm.c:331
+#: g10/gpg.c:449 sm/gpgsm.c:333
 msgid "use this user-id to sign or decrypt"
 msgstr "使用這個使用者 ID 來簽署或解密"
 
-#: g10/gpg.c:448 sm/gpgsm.c:334
+#: g10/gpg.c:450 sm/gpgsm.c:336
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
 
-#: g10/gpg.c:453 sm/gpgsm.c:336
+#: g10/gpg.c:455 sm/gpgsm.c:338
 msgid "use canonical text mode"
 msgstr "使用標準的文字模式"
 
-#: g10/gpg.c:467 sm/gpgsm.c:339 tools/gpgconf.c:68
-msgid "use as output file"
-msgstr "當作輸出檔案來使用"
+#: g10/gpg.c:469 sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "從 `%s' 讀取選項\n"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:71
+#: g10/gpg.c:482 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "不要做任何改變"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "覆寫前先詢問"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:526
 msgid "use strict OpenPGP behavior"
 msgstr "使用嚴謹的 OpenPGP 行為"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:527
 msgid "generate PGP 2.x compatible messages"
 msgstr "產生 PGP 2.x 相容性訊息"
 
-#: g10/gpg.c:553 sm/gpgsm.c:397
+#: g10/gpg.c:556 sm/gpgsm.c:400
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1692,7 +1731,7 @@ msgstr ""
 "@\n"
 "(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:400
+#: g10/gpg.c:559 sm/gpgsm.c:403
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1712,15 +1751,15 @@ msgstr ""
 " --list-keys [名字]         顯示金鑰\n"
 " --fingerprint [名字]       顯示指紋\n"
 
-#: g10/gpg.c:750 g10/gpgv.c:95
+#: g10/gpg.c:755 g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "請向 <gnupg-bugs@gnu.org> 回報程式瑕疵.\n"
 
-#: g10/gpg.c:767
+#: g10/gpg.c:772
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:775
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1730,7 +1769,7 @@ msgstr ""
 "簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: g10/gpg.c:781 sm/gpgsm.c:578
+#: g10/gpg.c:786 sm/gpgsm.c:583
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1738,547 +1777,551 @@ msgstr ""
 "\n"
 "已被支援的演算法:\n"
 
-#: g10/gpg.c:784
+#: g10/gpg.c:789
 msgid "Pubkey: "
 msgstr "公鑰: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2321
+#: g10/gpg.c:796 g10/keyedit.c:2321
 msgid "Cipher: "
 msgstr "編密法: "
 
-#: g10/gpg.c:798
+#: g10/gpg.c:803
 msgid "Hash: "
 msgstr "雜湊: "
 
-#: g10/gpg.c:805 g10/keyedit.c:2365
+#: g10/gpg.c:810 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "壓縮: "
 
-#: g10/gpg.c:875
+#: g10/gpg.c:817 sm/gpgsm.c:603
+msgid "Used libraries:"
+msgstr ""
+
+#: g10/gpg.c:925
 msgid "usage: gpg [options] "
 msgstr "用法: gpg [選項] "
 
-#: g10/gpg.c:1045 sm/gpgsm.c:715
+#: g10/gpg.c:1095 sm/gpgsm.c:768
 msgid "conflicting commands\n"
 msgstr "指令彼此矛盾\n"
 
-#: g10/gpg.c:1063
+#: g10/gpg.c:1113
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在群組定義 `%s' 裡找不到 = 記號\n"
 
-#: g10/gpg.c:1260
+#: g10/gpg.c:1310
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1263
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1266
+#: g10/gpg.c:1316
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1272
+#: g10/gpg.c:1322
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1325
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1328
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1284
+#: g10/gpg.c:1334
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1337
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1340
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1296
+#: g10/gpg.c:1346
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1349
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1352
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1445
+#: g10/gpg.c:1495
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的組態項目 `%s'\n"
 
-#: g10/gpg.c:1540
+#: g10/gpg.c:1590
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1542
+#: g10/gpg.c:1592
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1544
+#: g10/gpg.c:1594
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/gpg.c:1546
+#: g10/gpg.c:1596
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1550
+#: g10/gpg.c:1600
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1552
+#: g10/gpg.c:1602
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/gpg.c:1554
+#: g10/gpg.c:1604
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1556
+#: g10/gpg.c:1606
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1558
+#: g10/gpg.c:1608
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1560
+#: g10/gpg.c:1610
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "在私鑰清單和公鑰清單間切換"
 
-#: g10/gpg.c:1562
+#: g10/gpg.c:1612
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/gpg.c:1825
+#: g10/gpg.c:1875
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1981
+#: g10/gpg.c:2030
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "請注意: 舊有的預設選項檔 `%s' 已被忽略\n"
 
-#: g10/gpg.c:2241 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2290 g10/gpg.c:2955 g10/gpg.c:2967
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "請注意: 一般情況下不會用到 %s!\n"
 
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2471 g10/gpg.c:2483
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2493
+#: g10/gpg.c:2565
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' 不是一個有效的字元集\n"
 
-#: g10/gpg.c:2516 g10/gpg.c:2711 g10/keyedit.c:4084
+#: g10/gpg.c:2588 g10/gpg.c:2783 g10/keyedit.c:4084
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖析金鑰伺服器 URI\n"
 
-#: g10/gpg.c:2528
+#: g10/gpg.c:2600
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2531
+#: g10/gpg.c:2603
 msgid "invalid keyserver options\n"
 msgstr "無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2538
+#: g10/gpg.c:2610
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無效的匯入選項\n"
 
-#: g10/gpg.c:2541
+#: g10/gpg.c:2613
 msgid "invalid import options\n"
 msgstr "無效的匯入選項\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2620
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無效的匯出選項\n"
 
-#: g10/gpg.c:2551
+#: g10/gpg.c:2623
 msgid "invalid export options\n"
 msgstr "無效的匯出選項\n"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2630
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無效的清單選項\n"
 
-#: g10/gpg.c:2561
+#: g10/gpg.c:2633
 msgid "invalid list options\n"
 msgstr "無效的清單選項\n"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2641
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2571
+#: g10/gpg.c:2643
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2645
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2647
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2651
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2653
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2655
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2657
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2659
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2661
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2663
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2598
+#: g10/gpg.c:2670
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2673
 msgid "invalid verify options\n"
 msgstr "無效的驗證選項\n"
 
-#: g10/gpg.c:2608
+#: g10/gpg.c:2680
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設成 %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2855
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2858
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1298
+#: g10/gpg.c:2944 sm/gpgsm.c:1355
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程式可能會傾印出核心檔!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2948
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %s 會使得 %s 失效\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不被允許跟 %s 併用\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 跟 %s 放在一起沒有意義!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2975
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2989
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "妳祇有在 --pgp2 模式下纔能做出分離式或明文簽章\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2995
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下時, 不能同時簽署和加密\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:3001
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "啟用 --pgp2 時妳祇應該使用檔案, 而非管道\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:3014
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1370
+#: g10/gpg.c:3080 g10/gpg.c:3104 sm/gpgsm.c:1427
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1378
+#: g10/gpg.c:3086 g10/gpg.c:3110 sm/gpgsm.c:1435
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3092
 msgid "selected compression algorithm is invalid\n"
 msgstr "所選的壓縮演算法無效\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3098
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所選的憑證摘要演算法無效\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3113
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed 一定要大於 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3115
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed 一定要大於 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3117
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3119
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "無效的 default-cert-level; 一定要是 0, 1, 2 或 3\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3121
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3124
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "請注意: 強烈不建議使用單純的 S2K 模式 (0)\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3128
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3135
 msgid "invalid default preferences\n"
 msgstr "無效的預設偏好\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3144
 msgid "invalid personal cipher preferences\n"
 msgstr "無效的個人編密法偏好\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3148
 msgid "invalid personal digest preferences\n"
 msgstr "無效的個人摘要偏好\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3152
 msgid "invalid personal compress preferences\n"
 msgstr "無效的個人壓縮偏好\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3185
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 還沒辦法跟 %s 一起運作\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3232
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "妳不該將編密演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3237
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "妳不該將摘要演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3242
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "妳不該將壓縮演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3334
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3345
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3366
 msgid "--store [filename]"
 msgstr "--store [檔名]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3373
 msgid "--symmetric [filename]"
 msgstr "--symmetric [檔名]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3375
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' 的對稱式加密失敗: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3385
 msgid "--encrypt [filename]"
 msgstr "--encrypt [檔名]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3398
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [檔名]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3400
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3403
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3421
 msgid "--sign [filename]"
 msgstr "--sign [檔名]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3434
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [檔名]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3449
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [檔名]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3451
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3454
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3474
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [檔名]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3483
 msgid "--clearsign [filename]"
 msgstr "--clearsign [檔名]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3508
 msgid "--decrypt [filename]"
 msgstr "--decrypt [檔名]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3516
 msgid "--sign-key user-id"
 msgstr "--sign-key 使用者ID"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3520
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 使用者ID"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3541
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 使用者ID [指令]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "送至金鑰伺服器時失敗: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3628
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺服器接收時失敗: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3630
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出時失敗: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3641
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "從金鑰伺服器中搜尋時失敗: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3651
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺服器更新時失敗: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3702
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開封裝失敗: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3710
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行封裝失敗: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3800
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "無效的 `%s' 雜湊演算法\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3917
 msgid "[filename]"
 msgstr "[檔名]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3921
 msgid "Go ahead and type your message ...\n"
 msgstr "請開始鍵入妳的訊息 ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4233
 msgid "the given certification policy URL is invalid\n"
 msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4235
 msgid "the given signature policy URL is invalid\n"
 msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4268
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
@@ -2290,7 +2333,7 @@ msgstr "從這個鑰匙圈裡取用金鑰"
 msgid "make timestamp conflicts only a warning"
 msgstr "僅把時間戳印矛盾視為警告"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:372
+#: g10/gpgv.c:75 sm/gpgsm.c:375
 msgid "|FD|write status info to this FD"
 msgstr "|檔案描述|把狀態資訊寫入此檔案描述"
 
@@ -2815,13 +2858,13 @@ msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可寫的鑰匙圈: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:832 g10/sign.c:1141
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在寫到 `%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2369 g10/import.c:2391
+#: g10/import.c:2381 g10/import.c:2403
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "寫到鑰匙圈 `%s' 時發生錯誤: %s\n"
@@ -2910,7 +2953,7 @@ msgstr "金鑰 %s: 私鑰使用了無效的編密法 %d - 已跳過\n"
 msgid "importing secret keys not allowed\n"
 msgstr "未被允許匯入私鑰\n"
 
-#: g10/import.c:1158 g10/import.c:2384
+#: g10/import.c:1158 g10/import.c:2396
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "沒有預設的私鑰鑰匙圈: %s\n"
@@ -3034,40 +3077,40 @@ msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
 
-#: g10/import.c:1732
+#: g10/import.c:1744
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
 
-#: g10/import.c:1794
+#: g10/import.c:1806
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
 
-#: g10/import.c:1808
+#: g10/import.c:1820
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
 
-#: g10/import.c:1867
+#: g10/import.c:1879
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
 
-#: g10/import.c:1901
+#: g10/import.c:1913
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2302
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "請注意: 某份金鑰的序號 (S/N) 與卡片的序號並不吻合\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2310
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "請注意: 主鑰在線上且已存放於卡片上了\n"
 
-#: g10/import.c:2300
+#: g10/import.c:2312
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "請注意: 次鑰在線上且已存放於卡片上了\n"
 
@@ -3363,7 +3406,7 @@ msgid "Really sign? (y/N) "
 msgstr "真的要簽署嗎? (y/N)"
 
 #: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:348
+#: g10/keyedit.c:5019 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "簽署時失敗了: %s\n"
@@ -3696,8 +3739,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "妳真的想要撤銷這把次鑰嗎? (y/N) "
 
 #: g10/keyedit.c:2098
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr "使用使用者所提供的信任資料庫時可能無法設定主觀信任\n"
 
 #: g10/keyedit.c:2140
@@ -4554,13 +4596,13 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "產生金鑰失敗: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:273
+#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:275
+#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5148,17 +5190,17 @@ msgstr "未被壓縮"
 msgid "uncompressed|none"
 msgstr "uncompressed|none|未被壓縮|無"
 
-#: g10/misc.c:874
+#: g10/misc.c:891
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "這個訊息對 %s 來說無法使用\n"
 
-#: g10/misc.c:1049
+#: g10/misc.c:1066
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "不明確的選項 `%s'\n"
 
-#: g10/misc.c:1074
+#: g10/misc.c:1091
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "未知的選項 `%s'\n"
@@ -5214,12 +5256,12 @@ msgstr "警告: 以可能並不安全的對稱式加密過的階段金鑰\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 類別的子封包設定了關鍵位元\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:603
+#: g10/passphrase.c:295 g10/passphrase.c:581
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主要金鑰 ID %s)"
 
-#: g10/passphrase.c:327
+#: g10/passphrase.c:309
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5230,24 +5272,24 @@ msgstr ""
 "\"%.*s\"\n"
 "%u 位元長的 %s 金鑰, ID %s, 建立於 %s%s\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:334
 msgid "Repeat passphrase\n"
 msgstr "請再輸入一次密語\n"
 
-#: g10/passphrase.c:354
+#: g10/passphrase.c:336
 msgid "Enter passphrase\n"
 msgstr "請輸入密語\n"
 
-#: g10/passphrase.c:378
+#: g10/passphrase.c:363
 msgid "cancelled by user\n"
 msgstr "由使用者取消了\n"
 
-#: g10/passphrase.c:384 g10/passphrase.c:450
+#: g10/passphrase.c:369 g10/passphrase.c:428
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "代理程式的問題 - 正在停用代理程式\n"
 
-#: g10/passphrase.c:582
+#: g10/passphrase.c:560
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5256,12 +5298,12 @@ msgstr ""
 "妳需要用密語來解開下列使用者的\n"
 "私鑰: \"%s\"\n"
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:568
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u 位元長的 %s 金鑰, ID %s, 建立於 %s"
 
-#: g10/passphrase.c:599
+#: g10/passphrase.c:577
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (在主鑰 ID %s 上的子鑰)"
@@ -5870,69 +5912,53 @@ msgstr "金鑰 %s: 沒有子鑰可供子鑰撤銷簽章使用\n"
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "金鑰 %s: 沒有子鑰可供附子鑰簽章之用\n"
 
-#: g10/sign.c:82
-msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "無法在 v3 (PGP 2.x 型態) 的簽章內放入標記資料\n"
-
-#: g10/sign.c:90
-msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "無法在 v3 (PGP 2.x 型態) 的金鑰簽章內放入標記資料\n"
-
-#: g10/sign.c:104
+#: g10/sign.c:89
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr "警告: 標記 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
-#: g10/sign.c:121
-msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "無法在 v3 (PGP 2.x 型態) 的簽章內放入原則 URL\n"
-
-#: g10/sign.c:129
-msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr "無法在 v3 (PGP 2.x 型態) 的金鑰簽章內放入原則 URL\n"
-
-#: g10/sign.c:142
+#: g10/sign.c:115
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "警告: 原則 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
-#: g10/sign.c:170
+#: g10/sign.c:138
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr "警告: 偏好金鑰伺服器 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
-#: g10/sign.c:343
+#: g10/sign.c:311
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "檢查已建立的簽章時發生錯誤: %s\n"
 
-#: g10/sign.c:352
+#: g10/sign.c:320
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 簽章來自: \"%s\"\n"
 
-#: g10/sign.c:788
+#: g10/sign.c:758
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下祇能夠使用 PGP 2.x 型態的金鑰來做分離簽署\n"
 
-#: g10/sign.c:864
+#: g10/sign.c:834
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
 
-#: g10/sign.c:991
+#: g10/sign.c:961
 msgid "signing:"
 msgstr "簽署:"
 
-#: g10/sign.c:1106
+#: g10/sign.c:1076
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下祇能夠使用 PGP 2.x 型態的金鑰來做明文簽署\n"
 
-#: g10/sign.c:1290
+#: g10/sign.c:1260
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密將被採用\n"
@@ -6627,61 +6653,61 @@ msgstr "管理者個人識別碼 (PIN) 之驗證目前在此指令中被禁止�
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
 
-#: scd/scdaemon.c:108
+#: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:114 sm/gpgsm.c:361
+#: scd/scdaemon.c:111 sm/gpgsm.c:364
 #, fuzzy
 msgid "read options from file"
 msgstr "從 `%s' 讀取選項\n"
 
-#: scd/scdaemon.c:124
+#: scd/scdaemon.c:121
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:122
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:123
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:126
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:134
+#: scd/scdaemon.c:131
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:135
+#: scd/scdaemon.c:132
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "顯示管理者指令"
 
-#: scd/scdaemon.c:209
+#: scd/scdaemon.c:210
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: scd/scdaemon.c:211
+#: scd/scdaemon.c:212
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:658
+#: scd/scdaemon.c:668
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1006
+#: scd/scdaemon.c:1022
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1011
+#: scd/scdaemon.c:1028
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6715,11 +6741,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1631
+#: sm/certchain.c:195 sm/certchain.c:1646
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1631
+#: sm/certchain.c:196 sm/certchain.c:1646
 msgid "shell"
 msgstr ""
 
@@ -6759,8 +6785,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1659 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:105
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
+#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "存放金鑰失敗: %s\n"
@@ -6929,7 +6955,7 @@ msgstr ""
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1730
+#: sm/certchain.c:1462 sm/certchain.c:1745
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "偏好設定 `%s' 重複了\n"
@@ -6944,11 +6970,11 @@ msgstr "已建立撤銷憑證.\n"
 msgid "root certificate is good\n"
 msgstr "損壞的憑證"
 
-#: sm/certchain.c:1620
+#: sm/certchain.c:1635
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1629
+#: sm/certchain.c:1644
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -6963,7 +6989,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:187
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6977,25 +7003,25 @@ msgstr "no"
 msgid "[none]"
 msgstr "[未設定]"
 
-#: sm/certdump.c:550 sm/certdump.c:595 sm/certdump.c:660 sm/certdump.c:713
+#: sm/certdump.c:583 sm/certdump.c:628 sm/certdump.c:693 sm/certdump.c:746
 #, fuzzy
 msgid "[Error - invalid encoding]"
 msgstr "錯誤: 無效的回應.\n"
 
-#: sm/certdump.c:558 sm/certdump.c:603
+#: sm/certdump.c:591 sm/certdump.c:636
 msgid "[Error - out of core]"
 msgstr ""
 
-#: sm/certdump.c:640 sm/certdump.c:696
+#: sm/certdump.c:673 sm/certdump.c:729
 msgid "[Error - No name]"
 msgstr ""
 
-#: sm/certdump.c:665 sm/certdump.c:719
+#: sm/certdump.c:698 sm/certdump.c:752
 #, fuzzy
 msgid "[Error - invalid DN]"
 msgstr "錯誤: 無效的回應.\n"
 
-#: sm/certdump.c:936
+#: sm/certdump.c:946
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7122,190 +7148,199 @@ msgstr "刪除金鑰區塊時失敗了: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(沒有給定描述)\n"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:246
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[檔案]|建立一份簽章"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[檔案]|建立一份明文簽章"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:255
 #, fuzzy
 msgid "list external keys"
 msgstr "列出私鑰"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
 #, fuzzy
 msgid "list certificate chain"
 msgstr "損壞的憑證"
 
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:260
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "從公鑰鑰匙圈裡移去金鑰"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 #, fuzzy
 msgid "import certificates"
 msgstr "損壞的憑證"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "export certificates"
 msgstr "損壞的憑證"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "register a smartcard"
 msgstr "加入某把金鑰至智慧卡"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:269
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:270
 #, fuzzy
 msgid "change a passphrase"
 msgstr "更改密語"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "建立以 ASCII 封裝過的輸出"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:291
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:293
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:296
+#: sm/gpgsm.c:298
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:306
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:312
+#: sm/gpgsm.c:314
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:327
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "已跳過: 公鑰已經被設成預設收件者\n"
 
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:344
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:345
+msgid "|FILE|write a server mode log to FILE"
+msgstr ""
+
+#: sm/gpgsm.c:347
+#, fuzzy
+msgid "|FILE|write an audit log to FILE"
+msgstr "從 `%s' 讀取選項\n"
+
+#: sm/gpgsm.c:349
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "檢查簽章"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:350
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:355
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:356
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:357
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:359
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "從這個鑰匙圈裡取用金鑰"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:360
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "要有私鑰纔能這麼做.\n"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:709
+#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:362
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:363
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|名字|以「名字」作為加密對象"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:367
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:379
+#: sm/gpgsm.c:382
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:388
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "未知的編密演算法"
 
-#: sm/gpgsm.c:387
+#: sm/gpgsm.c:390
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s 簽章, 摘要演算法 %s\n"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:392
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "未知的壓縮演算法"
 
-#: sm/gpgsm.c:568
+#: sm/gpgsm.c:573
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: sm/gpgsm.c:571
+#: sm/gpgsm.c:576
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7316,36 +7351,36 @@ msgstr ""
 "簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: sm/gpgsm.c:650
+#: sm/gpgsm.c:703
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "用法: gpg [選項] "
 
-#: sm/gpgsm.c:748
+#: sm/gpgsm.c:801
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "無法連接至 `%s': %s\n"
 
-#: sm/gpgsm.c:759
+#: sm/gpgsm.c:812
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "未知的選項 `%s'\n"
 
-#: sm/gpgsm.c:1315
+#: sm/gpgsm.c:1372
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1411
+#: sm/gpgsm.c:1468
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1429
+#: sm/gpgsm.c:1486
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "無法存取 `%s': %s\n"
 
-#: sm/gpgsm.c:1612
+#: sm/gpgsm.c:1686
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7368,7 +7403,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:1274
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
@@ -7431,17 +7466,17 @@ msgstr "讀取 `%s' 時發生錯誤: %s\n"
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
 
-#: sm/qualified.c:111
+#: sm/qualified.c:105
 #, fuzzy, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "錯誤: 指紋格式化無效.\n"
 
-#: sm/qualified.c:129
+#: sm/qualified.c:123
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:225
+#: sm/qualified.c:200
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7452,13 +7487,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:234 sm/verify.c:536
+#: sm/qualified.c:209 sm/verify.c:580
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:327
+#: sm/qualified.c:277
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7471,290 +7506,308 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "檢查已建立的簽章時發生錯誤: %s\n"
 
-#: sm/verify.c:388
+#: sm/verify.c:424
 #, fuzzy
 msgid "Signature made "
 msgstr "由 %s 建立的簽章\n"
 
-#: sm/verify.c:392
+#: sm/verify.c:428
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:393
+#: sm/verify.c:429
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "取得現用金鑰資訊時發生錯誤: %s\n"
 
-#: sm/verify.c:514
+#: sm/verify.c:558
 #, fuzzy
 msgid "Good signature from"
 msgstr "完好的簽章來自於 \"%s\""
 
-#: sm/verify.c:515
+#: sm/verify.c:559
 #, fuzzy
 msgid "                aka"
 msgstr "                亦即 \"%s\""
 
-#: sm/verify.c:533
+#: sm/verify.c:577
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "這將會是一份自我簽章.\n"
 
-#: tools/gpg-connect-agent.c:59 tools/gpgconf.c:70 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "quit"
 
-#: tools/gpg-connect-agent.c:60
+#: tools/gpg-connect-agent.c:68
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:69
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:70
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:71
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:73
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:127
+#: tools/gpg-connect-agent.c:74
+#, fuzzy
+msgid "|FILE|run commands from FILE on startup"
+msgstr "從 `%s' 讀取選項\n"
+
+#: tools/gpg-connect-agent.c:75
+msgid "run /subst on startup"
+msgstr ""
+
+#: tools/gpg-connect-agent.c:174
 #, fuzzy
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: tools/gpg-connect-agent.c:130
+#: tools/gpg-connect-agent.c:177
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:314
+#: tools/gpg-connect-agent.c:1155
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:323
+#: tools/gpg-connect-agent.c:1164
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:381
+#: tools/gpg-connect-agent.c:1219 tools/gpg-connect-agent.c:1645
+#, fuzzy, c-format
+msgid "receiving line failed: %s\n"
+msgstr "讀取公鑰時失敗: %s\n"
+
+#: tools/gpg-connect-agent.c:1299
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "列太長"
 
-#: tools/gpg-connect-agent.c:385
+#: tools/gpg-connect-agent.c:1303
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:457
+#: tools/gpg-connect-agent.c:1619
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "未知的選項 `%s'\n"
 
-#: tools/gpg-connect-agent.c:465
+#: tools/gpg-connect-agent.c:1637
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "簽署時失敗了: %s\n"
 
-#: tools/gpg-connect-agent.c:473
-#, fuzzy, c-format
-msgid "receiving line failed: %s\n"
-msgstr "讀取公鑰時失敗: %s\n"
-
-#: tools/gpg-connect-agent.c:789
+#: tools/gpg-connect-agent.c:1986
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: tools/gpg-connect-agent.c:798
+#: tools/gpg-connect-agent.c:1995
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
 
-#: tools/gpgconf-comp.c:461 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:632
-#: tools/gpgconf-comp.c:694 tools/gpgconf-comp.c:775
+#: tools/gpgconf-comp.c:459 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:692 tools/gpgconf-comp.c:773
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:474 tools/gpgconf-comp.c:578 tools/gpgconf-comp.c:645
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
+#: tools/gpgconf-comp.c:705 tools/gpgconf-comp.c:796
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:484 tools/gpgconf-comp.c:603 tools/gpgconf-comp.c:658
-#: tools/gpgconf-comp.c:726 tools/gpgconf-comp.c:805
+#: tools/gpgconf-comp.c:482 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:656
+#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:803
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:489 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:663
-#: tools/gpgconf-comp.c:731 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:487 tools/gpgconf-comp.c:606 tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:729 tools/gpgconf-comp.c:811
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:497 tools/gpgconf-comp.c:613 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:737
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:504
+#: tools/gpgconf-comp.c:502
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508
+#: tools/gpgconf-comp.c:506
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:512
+#: tools/gpgconf-comp.c:510
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:526
+#: tools/gpgconf-comp.c:524
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:529
+#: tools/gpgconf-comp.c:527
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:533
+#: tools/gpgconf-comp.c:531
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:535
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:539
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:543
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "撤銷金鑰或所選的次鑰"
 
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:547
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:712
+#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:710
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|名字|以「名字」作為加密對象"
 
-#: tools/gpgconf-comp.c:671
+#: tools/gpgconf-comp.c:669
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "無法剖析金鑰伺服器 URI\n"
 
-#: tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:674
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:719
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:744
+#: tools/gpgconf-comp.c:742
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:786
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:824
+#: tools/gpgconf-comp.c:822
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:834
+#: tools/gpgconf-comp.c:832
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:845
+#: tools/gpgconf-comp.c:843
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:850
+#: tools/gpgconf-comp.c:848
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:887
+#: tools/gpgconf-comp.c:885
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2982
+#: tools/gpgconf-comp.c:3006
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:57
+#: tools/gpgconf.c:58
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:59
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:60
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
+#, fuzzy
+msgid "list global configuration file"
+msgstr "未知的組態項目 `%s'\n"
+
+#: tools/gpgconf.c:67
 #, fuzzy
 msgid "check global configuration file"
 msgstr "未知的組態項目 `%s'\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:71
+msgid "use as output file"
+msgstr "當作輸出檔案來使用"
+
+#: tools/gpgconf.c:75
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:97
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:100
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:176 tools/gpgconf.c:209
+#: tools/gpgconf.c:202 tools/gpgconf.c:240
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "用法: gpg [選項] "
 
-#: tools/gpgconf.c:178
+#: tools/gpgconf.c:204
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:187
+#: tools/gpgconf.c:213
 #, fuzzy
 msgid "Component not found"
 msgstr "找不到公鑰"
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:242
 #, fuzzy
 msgid "No argument allowed"
 msgstr "未允許使用管理者指令\n"
@@ -7848,92 +7901,104 @@ msgstr "讀取 `%s' 時發生錯誤: %s\n"
 msgid "error closing %s: %s\n"
 msgstr "在 `%s' 中出錯: %s\n"
 
-#: tools/symcryptrun.c:515
+#: tools/symcryptrun.c:486
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "沒有已支援的遠端程式執行\n"
 
-#: tools/symcryptrun.c:521
+#: tools/symcryptrun.c:492
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:527
+#: tools/symcryptrun.c:498
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:509
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:556
+#: tools/symcryptrun.c:527
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "無法建立 `%s': %s\n"
 
-#: tools/symcryptrun.c:563
+#: tools/symcryptrun.c:534
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "無法建立 `%s': %s\n"
 
-#: tools/symcryptrun.c:579
+#: tools/symcryptrun.c:550
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:607
+#: tools/symcryptrun.c:578
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: tools/symcryptrun.c:636
+#: tools/symcryptrun.c:607
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "刪除金鑰區塊時失敗了: %s\n"
 
-#: tools/symcryptrun.c:653
+#: tools/symcryptrun.c:624
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: tools/symcryptrun.c:705
+#: tools/symcryptrun.c:676
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: tools/symcryptrun.c:757
+#: tools/symcryptrun.c:728
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: tools/symcryptrun.c:771
+#: tools/symcryptrun.c:742
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:826
+#: tools/symcryptrun.c:797
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "無法建立備份檔案 `%s': %s\n"
 
-#: tools/symcryptrun.c:839
+#: tools/symcryptrun.c:810
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "無法建立備份檔案 `%s': %s\n"
 
-#: tools/symcryptrun.c:1014
+#: tools/symcryptrun.c:985
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1041
+#: tools/symcryptrun.c:1012
 msgid "no class provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1050
+#: tools/symcryptrun.c:1021
 #, fuzzy, c-format
 msgid "class %s is not supported\n"
 msgstr "保護摘要 %d 未被支援\n"
 
+#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "無法在 v3 (PGP 2.x 型態) 的簽章內放入標記資料\n"
+
+#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+#~ msgstr "無法在 v3 (PGP 2.x 型態) 的金鑰簽章內放入標記資料\n"
+
+#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+#~ msgstr "無法在 v3 (PGP 2.x 型態) 的簽章內放入原則 URL\n"
+
+#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+#~ msgstr "無法在 v3 (PGP 2.x 型態) 的金鑰簽章內放入原則 URL\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
diff --git a/scd/ChangeLog b/scd/ChangeLog
index 382961dbc..678083692 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,17 @@
+2007-11-14  Werner Koch  <wk@g10code.com>
+
+	* scdaemon.c (main): Pass STANDARD_SOCKET flag to
+	create_server_socket.
+	
+2007-11-13  Werner Koch  <wk@g10code.com>
+
+	* scdaemon.c (start_connection_thread): Do not call
+	assuan_sock_check_nonce if we are running in --server mode.
+
+2007-11-07  Werner Koch  <wk@g10code.com>
+
+	* scdaemon.h: Remove errors.h.
+
 2007-10-02  Werner Koch  <wk@g10code.com>
 
 	* command.c (cmd_getinfo): Add "pid" subcommand.
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 41085049b..8b5b7dcd7 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -632,7 +632,8 @@ main (int argc, char **argv )
                                             "S.scdaemon",
                                             "/tmp/gpg-XXXXXX/S.scdaemon");
           
-          fd = FD2INT(create_server_socket (0, socket_name, &socket_nonce));
+          fd = FD2INT(create_server_socket (standard_socket,
+                                            socket_name, &socket_nonce));
         }
 
       tattr = pth_attr_new();
@@ -656,6 +657,8 @@ main (int argc, char **argv )
           scd_exit (2);
         }
 
+      /* We run handle_connection to wait for the shutdown signal and
+         to run the ticker stuff.  */
       handle_connections (fd);
       if (fd != -1)
         close (fd);
@@ -678,7 +681,8 @@ main (int argc, char **argv )
                                         "S.scdaemon",
                                         "/tmp/gpg-XXXXXX/S.scdaemon");
 
-      fd = FD2INT (create_server_socket (0, socket_name, &socket_nonce));
+      fd = FD2INT (create_server_socket (standard_socket,
+                                         socket_name, &socket_nonce));
 
 
       fflush (NULL);
@@ -975,14 +979,16 @@ create_server_socket (int is_standard_name, const char *name,
  if (rc == -1)
     {
       log_error (_("error binding socket to `%s': %s\n"),
-		 serv_addr->sun_path, strerror (errno));
+		 serv_addr->sun_path,
+                 gpg_strerror (gpg_error_from_syserror ()));
       assuan_sock_close (fd);
       scd_exit (2);
     }
 
   if (listen (FD2INT(fd), 5 ) == -1)
     {
-      log_error (_("listen() failed: %s\n"), strerror (errno));
+      log_error (_("listen() failed: %s\n"),
+                 gpg_strerror (gpg_error_from_syserror ()));
       assuan_sock_close (fd);
       scd_exit (2);
     }
@@ -1001,7 +1007,8 @@ start_connection_thread (void *arg)
 {
   ctrl_t ctrl = arg;
 
-  if (assuan_sock_check_nonce (ctrl->thread_startup.fd, &socket_nonce))
+  if (ctrl->thread_startup.fd != GNUPG_INVALID_FD
+      && assuan_sock_check_nonce (ctrl->thread_startup.fd, &socket_nonce))
     {
       log_info (_("error reading nonce on fd %d: %s\n"), 
                 FD2INT(ctrl->thread_startup.fd), strerror (errno));
diff --git a/scd/scdaemon.h b/scd/scdaemon.h
index df4f89034..bfc9f358e 100644
--- a/scd/scdaemon.h
+++ b/scd/scdaemon.h
@@ -29,7 +29,6 @@
 #include <time.h>
 #include <gcrypt.h>
 #include "../common/util.h"
-#include "../common/errors.h"
 #include "../common/sysutils.h"
 
 /* To convey some special hash algorithms we use algorithm numbers
diff --git a/sm/ChangeLog b/sm/ChangeLog
index d67d23fbc..549779892 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,32 @@
+2007-11-19  Werner Koch  <wk@g10code.com>
+
+	* gpgsm.c (main): Print a warning if --audit-log is used.
+
+2007-11-15  Werner Koch  <wk@g10code.com>
+
+	* gpgsm.h (struct): Add XAUTHORITY and PINENTRY_USER_DATA.
+	* misc.c (setup_pinentry_env): Add XAUTHORITY and PINENTRY_USER_DATA.
+	* gpgsm.c (main): New option --xauthority.
+	* call-agent.c (start_agent): Adjust for changed start_new_gpg_agent.
+	* server.c (option_handler): Ad the new options.
+
+2007-11-07  Werner Koch  <wk@g10code.com>
+
+	* gpgsm.c (main): New option --audit-log.
+	* server.c (option_handler): New option enable-audit-log.
+	(start_audit_session): New.
+	(cmd_verify): Create audit context.
+	(gpgsm_server): Release the context.
+
+	* gpgsm.h (struct server_control_s): Add member AUDIT, include
+	audit.h.
+	* certdump.c (gpgsm_format_sn_issuer): New.
+	* verify.c (hash_data): Return an error code.
+	(gpgsm_verify): Add calls to audit_log.
+
+	* gpgsm.c (get_status_string): Remove.
+	* gpgsm.h: Include status.h instead of errors.h.
+	
 2007-10-19  Werner Koch  <wk@g10code.com>
 
 	* qualified.c (gpgsm_qualified_consent): Use i18N-swicth functions.
diff --git a/sm/call-agent.c b/sm/call-agent.c
index 88447bd63..3f4e11ec2 100644
--- a/sm/call-agent.c
+++ b/sm/call-agent.c
@@ -81,6 +81,7 @@ start_agent (ctrl_t ctrl)
                               opt.agent_program,
                               opt.display, opt.ttyname, opt.ttytype,
                               opt.lc_ctype, opt.lc_messages,
+                              opt.xauthority, opt.pinentry_user_data,
                               opt.verbose, DBG_ASSUAN,
                               gpgsm_status2, ctrl);
 
diff --git a/sm/certchain.c b/sm/certchain.c
index c2f61aa28..f30c0c0ae 100644
--- a/sm/certchain.c
+++ b/sm/certchain.c
@@ -1561,6 +1561,21 @@ do_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t checktime_arg,
         }
     }
 
+  /* If auditing has been enabled, record what is in the chain.  */
+  if (ctrl->audit)
+    {
+      chain_item_t ci;
+
+      audit_log (ctrl->audit, AUDIT_CHAIN_BEGIN);
+      for (ci = chain; ci; ci = ci->next)
+        {
+          audit_log_cert (ctrl->audit,
+                          ci->is_root? AUDIT_CHAIN_ROOTCERT : AUDIT_CHAIN_CERT,
+                          ci->cert, 0);
+        }
+      audit_log (ctrl->audit, AUDIT_CHAIN_END);
+    }
+
   if (r_exptime)
     gnupg_copy_time (r_exptime, exptime);
   xfree (issuer);
@@ -1579,7 +1594,7 @@ do_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t checktime_arg,
 }
 
 
-/* Validate a certifcate chain.  For a description see the
+/* Validate a certificate chain.  For a description see
    do_validate_chain.  This function is a wrapper to handle a root
    certificate with the chain_model flag set.  If RETFLAGS is not
    NULL, flags indicating now the verification was done are stored
diff --git a/sm/certdump.c b/sm/certdump.c
index 9798cce4c..66c395f32 100644
--- a/sm/certdump.c
+++ b/sm/certdump.c
@@ -242,6 +242,37 @@ gpgsm_dump_cert (const char *text, ksba_cert_t cert)
 }
 
 
+/* Return a new string holding the format serial number and issuer
+   ("#SN/issuer").  No filtering on invalid characters is done.
+   Caller must release the string.  On memory failure NULL is
+   returned.  */
+char *
+gpgsm_format_sn_issuer (ksba_sexp_t sn, const char *issuer)
+{
+  char *p, *p1;
+
+  if (sn && issuer)
+    {
+      p1 = gpgsm_format_serial (sn);
+      if (!p1)
+        p = xtrystrdup ("[invalid SN]");
+      else
+        {
+          p = xtrymalloc (strlen (p1) + strlen (issuer) + 2 + 1);
+          if (p)
+            {
+              *p = '#';
+              strcpy (stpcpy (stpcpy (p+1, p1),"/"), issuer);
+            }
+          xfree (p1);
+        }
+    }
+  else
+    p = xtrystrdup ("[invalid SN/issuer]");
+  return p;
+}
+
+
 /* Log the certificate's name in "#SN/ISSUERDN" format along with
    TEXT. */
 void 
@@ -272,6 +303,8 @@ gpgsm_cert_log_name (const char *text, ksba_cert_t cert)
 
 
 
+
+
 
 /* helper for the rfc2253 string parser */
 static const unsigned char *
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 0d6da9548..7ed4372a2 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -108,6 +108,7 @@ enum cmd_and_opt_values {
   oFixedPassphrase,
   oLogFile,
   oNoLogFile,
+  oAuditLog,
 
   oEnableSpecialFilenames,
 
@@ -117,6 +118,7 @@ enum cmd_and_opt_values {
   oTTYtype,
   oLCctype,
   oLCmessages,
+  oXauthority,
 
   oPreferSystemDirmngr,
   oDirmngrProgram,
@@ -336,12 +338,13 @@ static ARGPARSE_OPTS opts[] = {
     { oTextmode, "textmode",  0, N_("use canonical text mode")},
 #endif
 
-    { oOutput, "output",    2, N_("use as output file")},
+    { oOutput, "output",    2, N_("|FILE|write output to FILE")},
     { oVerbose, "verbose",   0, N_("verbose") },
     { oQuiet,	"quiet",   0, N_("be somewhat more quiet") },
     { oNoTTY, "no-tty", 0, N_("don't use the terminal at all") },
-    { oLogFile, "log-file"   ,2, N_("use a log file for the server")},
+    { oLogFile, "log-file"   ,2, N_("|FILE|write a server mode log to FILE")},
     { oNoLogFile, "no-log-file" ,0, "@"},
+    { oAuditLog, "audit-log", 2, N_("|FILE|write an audit log to FILE")},
 #if 0
     { oForceV3Sigs, "force-v3-sigs", 0, N_("force v3 signatures") },
     { oForceMDC, "force-mdc", 0, N_("always use a MDC for encryption") },
@@ -424,6 +427,7 @@ static ARGPARSE_OPTS opts[] = {
     { oTTYtype,    "ttytype",     2, "@" },
     { oLCctype,    "lc-ctype",    2, "@" },
     { oLCmessages, "lc-messages", 2, "@" },
+    { oXauthority, "xauthority", 2, "@" },
     { oDirmngrProgram, "dirmngr-program", 2 , "@" },
     { oProtectToolProgram, "protect-tool-program", 2 , "@" },
     { oFakedSystemTime, "faked-system-time", 2, "@" }, /* (epoch time) */
@@ -831,6 +835,7 @@ main ( int argc, char **argv)
   int default_config =1;
   int default_keyring = 1;
   char *logfile = NULL;
+  char *auditlog = NULL;
   int greeting = 0;
   int nogreeting = 0;
   int debug_wait = 0;
@@ -1151,6 +1156,8 @@ main ( int argc, char **argv)
         case oLogFile: logfile = pargs.r.ret_str; break;
         case oNoLogFile: logfile = NULL; break;          
 
+        case oAuditLog: auditlog = pargs.r.ret_str; break;
+
         case oBatch: 
           opt.batch = 1;
           greeting = 0;
@@ -1201,6 +1208,7 @@ main ( int argc, char **argv)
         case oTTYtype: opt.ttytype = xstrdup (pargs.r.ret_str); break;
         case oLCctype: opt.lc_ctype = xstrdup (pargs.r.ret_str); break;
         case oLCmessages: opt.lc_messages = xstrdup (pargs.r.ret_str); break;
+        case oXauthority: opt.xauthority = xstrdup (pargs.r.ret_str); break;
         case oDirmngrProgram: opt.dirmngr_program = pargs.r.ret_str;  break;
         case oPreferSystemDirmngr: opt.prefer_system_dirmngr = 1; break;
         case oProtectToolProgram:
@@ -1343,6 +1351,11 @@ main ( int argc, char **argv)
     }
 #  endif
 
+  if (auditlog)
+    log_info ("NOTE: The audit log feature (--audit-log) is "
+              "WORK IN PRORESS and not ready for use!\n");
+
+
   if (may_coredump && !opt.quiet)
     log_info (_("WARNING: program may create a core file!\n"));
 
@@ -1636,6 +1649,7 @@ main ( int argc, char **argv)
     case aVerify:
       {
         FILE *fp = NULL;
+        FILE *auditfp = NULL;
 
         set_binary (stdin);
         if (argc == 2 && opt.outfile)
@@ -1643,6 +1657,13 @@ main ( int argc, char **argv)
         else if (opt.outfile)
           fp = open_fwrite (opt.outfile);
 
+        if (auditlog)
+          {
+            audit_release (ctrl.audit);
+            ctrl.audit = audit_new ();
+            auditfp = open_fwrite (auditlog);
+          }
+
         if (!argc)
           gpgsm_verify (&ctrl, 0, -1, fp); /* normal signature from stdin */
         else if (argc == 1)
@@ -1652,8 +1673,17 @@ main ( int argc, char **argv)
         else
           wrong_args ("--verify [signature [detached_data]]");
 
+        if (auditlog)
+          {
+            audit_print_result (ctrl.audit, auditfp);
+            audit_release (ctrl.audit);
+            ctrl.audit = NULL;
+          }
+
         if (fp && fp != stdout)
           fclose (fp);
+        if (auditfp && auditfp != stdout)
+          fclose (auditfp);
       }
       break;
 
diff --git a/sm/gpgsm.h b/sm/gpgsm.h
index 7c9066577..8f9692a73 100644
--- a/sm/gpgsm.h
+++ b/sm/gpgsm.h
@@ -29,8 +29,9 @@
 
 #include <ksba.h>
 #include "../common/util.h"
-#include "../common/errors.h"
+#include "../common/status.h"
 #include "../common/estream.h"
+#include "../common/audit.h"
 
 #define MAX_DIGEST_LEN 24 
 
@@ -53,6 +54,8 @@ struct
   char *ttytype;
   char *lc_ctype;
   char *lc_messages;
+  char *xauthority;
+  char *pinentry_user_data;
 
   const char *dirmngr_program;
   int prefer_system_dirmngr;  /* Prefer using a system wide drimngr.  */
@@ -147,6 +150,9 @@ struct server_control_s
   int no_server;      /* We are not running under server control */
   int  status_fd;     /* Only for non-server mode */
   struct server_local_s *server_local;
+  
+  audit_ctx_t audit;  /* NULL or a context for the audit subsystem.  */
+  
   int with_colons;    /* Use column delimited output format */
   int with_chain;     /* Include the certifying certs in a listing */
   int with_validation;/* Validate each key while listing. */
@@ -248,6 +254,7 @@ void gpgsm_dump_string (const char *string);
 char *gpgsm_format_serial (ksba_const_sexp_t p);
 char *gpgsm_format_name2 (const char *name, int translate);
 char *gpgsm_format_name (const char *name);
+char *gpgsm_format_sn_issuer (ksba_sexp_t sn, const char *issuer);
 
 char *gpgsm_fpr_and_name_for_status (ksba_cert_t cert);
 
diff --git a/sm/misc.c b/sm/misc.c
index 7da206aba..38994725e 100644
--- a/sm/misc.c
+++ b/sm/misc.c
@@ -76,6 +76,13 @@ setup_pinentry_env (void)
   else if ( (lc = setlocale (LC_MESSAGES, "")) )
     setenv ("LC_MESSAGES", lc, 1);
 #endif
+
+  if (opt.xauthority)
+    setenv ("XAUTHORITY", opt.xauthority, 1);
+
+  if (opt.pinentry_user_data)
+    setenv ("PINENTRY_USER_DATA", opt.pinentry_user_data, 1);
+
 #endif /*!HAVE_W32_SYSTEM*/
 }
 
diff --git a/sm/server.c b/sm/server.c
index f780bf832..3b0968257 100644
--- a/sm/server.c
+++ b/sm/server.c
@@ -1,5 +1,6 @@
 /* server.c - Server mode and main entry point 
- * Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006,
+ *               2007 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -44,6 +45,7 @@ struct server_local_s {
   int list_internal;
   int list_external;
   int list_to_output;           /* Write keylistings to the output fd. */
+  int enable_audit_log;         /* Use an audit log.  */
   certlist_t recplist;
   certlist_t signerlist;
   certlist_t default_recplist; /* As set by main() - don't release. */
@@ -161,6 +163,19 @@ close_message_fd (ctrl_t ctrl)
 }
 
 
+/* Start a new audit session if this has been enabled.  */
+static gpg_error_t
+start_audit_session (ctrl_t ctrl)
+{
+  audit_release (ctrl->audit);
+  ctrl->audit = NULL;
+  if (ctrl->server_local->enable_audit_log && !(ctrl->audit = audit_new ()) )
+    return gpg_error_from_syserror ();
+  
+  return 0;
+}
+
+
 static int
 option_handler (assuan_context_t ctx, const char *key, const char *value)
 {
@@ -213,6 +228,22 @@ option_handler (assuan_context_t ctx, const char *key, const char *value)
       if (!opt.lc_messages)
         return out_of_core ();
     }
+  else if (!strcmp (key, "xauthority"))
+    {
+      if (opt.xauthority)
+        free (opt.xauthority);
+      opt.xauthority = strdup (value);
+      if (!opt.xauthority)
+        return out_of_core ();
+    }
+  else if (!strcmp (key, "pinentry-user-data"))
+    {
+      if (opt.pinentry_user_data)
+        free (opt.pinentry_user_data);
+      opt.pinentry_user_data = strdup (value);
+      if (!opt.pinentry_user_data)
+        return out_of_core ();
+    }
   else if (!strcmp (key, "list-mode"))
     {
       int i = *value? atoi (value) : 0;
@@ -256,6 +287,11 @@ option_handler (assuan_context_t ctx, const char *key, const char *value)
     {
       opt.with_key_data = 1;
     }
+  else if (!strcmp (key, "enable-audit-log"))
+    {
+      int i = *value? atoi (value) : 0;
+      ctrl->server_local->enable_audit_log = i;
+    }
   else
     return gpg_error (GPG_ERR_UNKNOWN_OPTION);
 
@@ -519,8 +555,10 @@ cmd_verify (assuan_context_t ctx, char *line)
         return set_error (GPG_ERR_ASS_GENERAL, "fdopen() failed");
     }
 
-  rc = gpgsm_verify (assuan_get_pointer (ctx), fd,
-                     ctrl->server_local->message_fd, out_fp);
+  rc = start_audit_session (ctrl);
+  if (!rc)
+    rc = gpgsm_verify (assuan_get_pointer (ctx), fd,
+                       ctrl->server_local->message_fd, out_fp);
   if (out_fp)
     fclose (out_fp);
 
@@ -1037,91 +1075,13 @@ gpgsm_server (certlist_t default_recplist)
   ctrl.server_local->signerlist = NULL;
   xfree (ctrl.server_local);
 
+  audit_release (ctrl.audit);
+  ctrl.audit = NULL;
+
   assuan_deinit_server (ctx);
 }
 
 
-static const char *
-get_status_string ( int no ) 
-{
-  const char *s;
-
-  switch (no)
-    {
-    case STATUS_ENTER  : s = "ENTER"; break;
-    case STATUS_LEAVE  : s = "LEAVE"; break;
-    case STATUS_ABORT  : s = "ABORT"; break;
-    case STATUS_NEWSIG : s = "NEWSIG"; break;
-    case STATUS_GOODSIG: s = "GOODSIG"; break;
-    case STATUS_SIGEXPIRED: s = "SIGEXPIRED"; break;
-    case STATUS_KEYREVOKED: s = "KEYREVOKED"; break;
-    case STATUS_BADSIG : s = "BADSIG"; break;
-    case STATUS_ERRSIG : s = "ERRSIG"; break;
-    case STATUS_BADARMOR : s = "BADARMOR"; break;
-    case STATUS_RSA_OR_IDEA : s= "RSA_OR_IDEA"; break;
-    case STATUS_TRUST_UNDEFINED: s = "TRUST_UNDEFINED"; break;
-    case STATUS_TRUST_NEVER	 : s = "TRUST_NEVER"; break;
-    case STATUS_TRUST_MARGINAL : s = "TRUST_MARGINAL"; break;
-    case STATUS_TRUST_FULLY	 : s = "TRUST_FULLY"; break;
-    case STATUS_TRUST_ULTIMATE : s = "TRUST_ULTIMATE"; break;
-    case STATUS_GET_BOOL	 : s = "GET_BOOL"; break;
-    case STATUS_GET_LINE	 : s = "GET_LINE"; break;
-    case STATUS_GET_HIDDEN	 : s = "GET_HIDDEN"; break;
-    case STATUS_GOT_IT	 : s = "GOT_IT"; break;
-    case STATUS_SHM_INFO	 : s = "SHM_INFO"; break;
-    case STATUS_SHM_GET	 : s = "SHM_GET"; break;
-    case STATUS_SHM_GET_BOOL	 : s = "SHM_GET_BOOL"; break;
-    case STATUS_SHM_GET_HIDDEN : s = "SHM_GET_HIDDEN"; break;
-    case STATUS_NEED_PASSPHRASE: s = "NEED_PASSPHRASE"; break;
-    case STATUS_VALIDSIG	 : s = "VALIDSIG"; break;
-    case STATUS_SIG_ID	 : s = "SIG_ID"; break;
-    case STATUS_ENC_TO	 : s = "ENC_TO"; break;
-    case STATUS_NODATA	 : s = "NODATA"; break;
-    case STATUS_BAD_PASSPHRASE : s = "BAD_PASSPHRASE"; break;
-    case STATUS_NO_PUBKEY	 : s = "NO_PUBKEY"; break;
-    case STATUS_NO_SECKEY	 : s = "NO_SECKEY"; break;
-    case STATUS_NEED_PASSPHRASE_SYM: s = "NEED_PASSPHRASE_SYM"; break;
-    case STATUS_DECRYPTION_FAILED: s = "DECRYPTION_FAILED"; break;
-    case STATUS_DECRYPTION_OKAY: s = "DECRYPTION_OKAY"; break;
-    case STATUS_MISSING_PASSPHRASE: s = "MISSING_PASSPHRASE"; break;
-    case STATUS_GOOD_PASSPHRASE : s = "GOOD_PASSPHRASE"; break;
-    case STATUS_GOODMDC	 : s = "GOODMDC"; break;
-    case STATUS_BADMDC	 : s = "BADMDC"; break;
-    case STATUS_ERRMDC	 : s = "ERRMDC"; break;
-    case STATUS_IMPORTED	 : s = "IMPORTED"; break;
-    case STATUS_IMPORT_OK        : s = "IMPORT_OK"; break;
-    case STATUS_IMPORT_RES	 : s = "IMPORT_RES"; break;
-    case STATUS_FILE_START	 : s = "FILE_START"; break;
-    case STATUS_FILE_DONE	 : s = "FILE_DONE"; break;
-    case STATUS_FILE_ERROR	 : s = "FILE_ERROR"; break;
-    case STATUS_BEGIN_DECRYPTION:s = "BEGIN_DECRYPTION"; break;
-    case STATUS_END_DECRYPTION : s = "END_DECRYPTION"; break;
-    case STATUS_BEGIN_ENCRYPTION:s = "BEGIN_ENCRYPTION"; break;
-    case STATUS_END_ENCRYPTION : s = "END_ENCRYPTION"; break;
-    case STATUS_DELETE_PROBLEM : s = "DELETE_PROBLEM"; break;
-    case STATUS_PROGRESS	 : s = "PROGRESS"; break;
-    case STATUS_SIG_CREATED	 : s = "SIG_CREATED"; break;
-    case STATUS_SESSION_KEY	 : s = "SESSION_KEY"; break;
-    case STATUS_NOTATION_NAME  : s = "NOTATION_NAME" ; break;
-    case STATUS_NOTATION_DATA  : s = "NOTATION_DATA" ; break;
-    case STATUS_POLICY_URL     : s = "POLICY_URL" ; break;
-    case STATUS_BEGIN_STREAM   : s = "BEGIN_STREAM"; break;
-    case STATUS_END_STREAM     : s = "END_STREAM"; break;
-    case STATUS_KEY_CREATED    : s = "KEY_CREATED"; break;
-    case STATUS_UNEXPECTED     : s = "UNEXPECTED"; break;
-    case STATUS_INV_RECP       : s = "INV_RECP"; break;
-    case STATUS_NO_RECP        : s = "NO_RECP"; break;
-    case STATUS_ALREADY_SIGNED : s = "ALREADY_SIGNED"; break;
-    case STATUS_EXPSIG         : s = "EXPSIG"; break;
-    case STATUS_EXPKEYSIG      : s = "EXPKEYSIG"; break;
-    case STATUS_TRUNCATED      : s = "TRUNCATED"; break;
-    case STATUS_ERROR          : s = "ERROR"; break;
-    case STATUS_IMPORT_PROBLEM : s = "IMPORT_PROBLEM"; break;
-    default: s = "?"; break;
-    }
-  return s;
-}
-
 
 gpg_error_t
 gpgsm_status2 (ctrl_t ctrl, int no, ...)
diff --git a/sm/verify.c b/sm/verify.c
index 4e92c11d8..b0ced0062 100644
--- a/sm/verify.c
+++ b/sm/verify.c
@@ -47,10 +47,11 @@ strtimestamp_r (ksba_isotime_t atime)
 
 
 
-/* Hash the data for a detached signature */
-static void
+/* Hash the data for a detached signature.  Returns 0 on success.  */
+static gpg_error_t
 hash_data (int fd, gcry_md_hd_t md)
 {
+  gpg_error_t err = 0;
   FILE *fp;
   char buffer[4096];
   int nread;
@@ -58,8 +59,9 @@ hash_data (int fd, gcry_md_hd_t md)
   fp = fdopen ( dup (fd), "rb");
   if (!fp)
     {
-      log_error ("fdopen(%d) failed: %s\n", fd, strerror (errno));
-      return;
+      err = gpg_error_from_syserror ();
+      log_error ("fdopen(%d) failed: %s\n", fd, gpg_strerror (err));
+      return err;
     }
 
   do 
@@ -69,8 +71,12 @@ hash_data (int fd, gcry_md_hd_t md)
     }
   while (nread);
   if (ferror (fp))
-      log_error ("read error on fd %d: %s\n", fd, strerror (errno));
+    {
+      err = gpg_error_from_syserror ();
+      log_error ("read error on fd %d: %s\n", fd, gpg_strerror (err));
+    }
   fclose (fp);
+  return err;
 }
 
 
@@ -99,6 +105,8 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
   FILE *fp = NULL;
   char *p;
 
+  audit_set_type (ctrl->audit, AUDIT_TYPE_VERIFY);
+
   kh = keydb_new (0);
   if (!kh)
     {
@@ -154,6 +162,8 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
   if (DBG_HASHING)
     gcry_md_start_debug (data_md, "vrfy.data");
 
+  audit_log (ctrl->audit, AUDIT_SETUP_READY);
+
   is_detached = 0;
   do 
     {
@@ -167,6 +177,7 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
       if (stopreason == KSBA_SR_NEED_HASH)
         {
           is_detached = 1;
+          audit_log (ctrl->audit, AUDIT_DETACHED_SIGNATURE);
           if (opt.verbose)
             log_info ("detached signature\n");
         }
@@ -185,17 +196,25 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
                       && (  !strcmp (algoid, "1.2.840.113549.1.1.2")
                           ||!strcmp (algoid, "1.2.840.113549.2.2")))
                     log_info (_("(this is the MD2 algorithm)\n"));
+                  audit_log_s (ctrl->audit, AUDIT_BAD_DATA_HASH_ALGO, algoid);
                 }
               else
-                gcry_md_enable (data_md, algo);
+                {
+                  gcry_md_enable (data_md, algo);
+                  audit_log_i (ctrl->audit, AUDIT_DATA_HASH_ALGO, algo);
+                }
             }
           if (is_detached)
             {
               if (data_fd == -1)
-                log_info ("detached signature w/o data "
-                          "- assuming certs-only\n");
+                {
+                  log_info ("detached signature w/o data "
+                            "- assuming certs-only\n");
+                  audit_log (ctrl->audit, AUDIT_CERT_ONLY_SIG);
+                }
               else
-                hash_data (data_fd, data_md);  
+                audit_log_ok (ctrl->audit, AUDIT_DATA_HASHING,
+                              hash_data (data_fd, data_md));
             }
           else
             {
@@ -215,6 +234,7 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
       if (rc) 
         {
           log_error ("write failed: %s\n", gpg_strerror (rc));
+          audit_log_ok (ctrl->audit, AUDIT_WRITE_ERROR, rc);
           goto leave;
         }
     }
@@ -223,6 +243,7 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
     {
       log_error ("data given for a non-detached signature\n");
       rc = gpg_error (GPG_ERR_CONFLICT);
+      audit_log (ctrl->audit, AUDIT_USAGE_ERROR);
       goto leave;
     }
 
@@ -232,7 +253,8 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
          certificate first before entering it into the DB.  This way
          we would avoid cluttering the DB with invalid
          certificates. */
-      keydb_store_cert (cert, 0, NULL);
+      audit_log_cert (ctrl->audit, AUDIT_SAVE_CERT, cert, 
+                      keydb_store_cert (cert, 0, NULL));
       ksba_cert_release (cert);
     }
 
@@ -265,6 +287,7 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
         }
 
       gpgsm_status (ctrl, STATUS_NEWSIG, NULL);
+      audit_log_i (ctrl->audit, AUDIT_NEW_SIG, signer);
 
       if (DBG_X509)
         {
@@ -274,6 +297,12 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
           gpgsm_dump_serial (serial);
           log_printf ("\n");
         }
+      if (ctrl->audit)
+        {
+          char *tmpstr = gpgsm_format_sn_issuer (serial, issuer);
+          audit_log_s (ctrl->audit, AUDIT_SIG_NAME, tmpstr);
+          xfree (tmpstr);
+        }
 
       rc = ksba_cms_get_signing_time (cms, signer, sigtime);
       if (gpg_err_code (rc) == GPG_ERR_NO_DATA)
@@ -300,6 +329,7 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
                || !is_enabled)
             {
               log_error ("digest algo %d has not been enabled\n", algo);
+              audit_log_s (ctrl->audit, AUDIT_SIG_STATUS, "unsupported");
               goto next_signer;
             }
         }
@@ -311,7 +341,10 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
           algo = 0; 
         }
       else /* real error */
-        break;
+        {
+          audit_log_s (ctrl->audit, AUDIT_SIG_STATUS, "error");
+          break;
+        }
 
       rc = ksba_cms_get_sigattr_oids (cms, signer,
                                       "1.2.840.113549.1.9.3", &ctattr);
@@ -330,6 +363,7 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
                          "actual content-type\n");
               ksba_free (ctattr);
               ctattr = NULL;
+              audit_log_s (ctrl->audit, AUDIT_SIG_STATUS, "bad");
               goto next_signer;
             }
           ksba_free (ctattr);
@@ -339,6 +373,7 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
         {
           log_error ("error getting content-type attribute: %s\n",
                      gpg_strerror (rc));
+          audit_log_s (ctrl->audit, AUDIT_SIG_STATUS, "bad");
           goto next_signer;
         }
       rc = 0;
@@ -348,6 +383,7 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
       if (!sigval)
         {
           log_error ("no signature value available\n");
+          audit_log_s (ctrl->audit, AUDIT_SIG_STATUS, "bad");
           goto next_signer;
         }
       if (DBG_X509)
@@ -373,8 +409,7 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
             gpgsm_status2 (ctrl, STATUS_ERROR, "verify.findkey",
                            numbuf, NULL);
           }
-          /* fixme: we might want to append the issuer and serial
-             using our standard notation */
+          audit_log_s (ctrl->audit, AUDIT_SIG_STATUS, "no-cert");
           goto next_signer;
         }
 
@@ -382,6 +417,7 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
       if (rc)
         {
           log_error ("failed to get cert: %s\n", gpg_strerror (rc));
+          audit_log_s (ctrl->audit, AUDIT_SIG_STATUS, "error");
           goto next_signer;
         }
 
@@ -413,6 +449,7 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
               fpr = gpgsm_fpr_and_name_for_status (cert);
               gpgsm_status (ctrl, STATUS_BADSIG, fpr);
               xfree (fpr);
+              audit_log_s (ctrl->audit, AUDIT_SIG_STATUS, "bad");
               goto next_signer; 
             }
             
@@ -420,6 +457,7 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
           if (rc)
             {
               log_error ("md_open failed: %s\n", gpg_strerror (rc));
+              audit_log_s (ctrl->audit, AUDIT_SIG_STATUS, "error");
               goto next_signer;
             }
           if (DBG_HASHING)
@@ -432,6 +470,7 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
               log_error ("hashing signed attrs failed: %s\n",
                          gpg_strerror (rc));
               gcry_md_close (md);
+              audit_log_s (ctrl->audit, AUDIT_SIG_STATUS, "error");
               goto next_signer;
             }
           rc = gpgsm_check_cms_signature (cert, sigval, md, algo, 
@@ -452,6 +491,7 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
           fpr = gpgsm_fpr_and_name_for_status (cert);
           gpgsm_status (ctrl, STATUS_BADSIG, fpr);
           xfree (fpr);
+          audit_log_s (ctrl->audit, AUDIT_SIG_STATUS, "bad");
           goto next_signer;
         }
       rc = gpgsm_cert_use_verify_p (cert); /*(this displays an info message)*/
@@ -464,6 +504,7 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
 
       if (DBG_X509)
         log_debug ("signature okay - checking certs\n");
+      audit_log (ctrl->audit, AUDIT_VALIDATE_CHAIN);
       rc = gpgsm_validate_chain (ctrl, cert,
                                  *sigtime? sigtime : "19700101T000000",
                                  keyexptime, 0, 
@@ -506,9 +547,12 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp)
           else
             gpgsm_status_with_err_code (ctrl, STATUS_TRUST_UNDEFINED, NULL, 
                                         gpg_err_code (rc));
+          audit_log_s (ctrl->audit, AUDIT_SIG_STATUS, "bad");
           goto next_signer;
         }
 
+      audit_log_s (ctrl->audit, AUDIT_SIG_STATUS, "good");
+
       for (i=0; (p = ksba_cert_get_subject (cert, i)); i++)
         {
           log_info (!i? _("Good signature from")
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 1d755a598..2775c135a 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-15  Werner Koch  <wk@g10code.com>
+
+	* gpg-connect-agent.c (start_agent): Adjust changed
+	send_pinentry_environment.
+
 2007-10-24  Werner Koch  <wk@g10code.com>
 
 	* gpg-connect-agent.c (substitute_line): Restore temporary nul
diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index 1af1e6c93..e0abaa9c9 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -1989,7 +1989,7 @@ start_agent (void)
     }
 
   rc = send_pinentry_environment (ctx, GPG_ERR_SOURCE_DEFAULT,
-                                  NULL, NULL, NULL, NULL, NULL);
+                                  NULL, NULL, NULL, NULL, NULL, NULL, NULL);
   if (rc)
     {
       log_error (_("error sending standard options: %s\n"), gpg_strerror (rc));