diff --git a/NEWS b/NEWS
index 34e1174ac..4ea308e72 100644
--- a/NEWS
+++ b/NEWS
@@ -7,8 +7,9 @@ Noteworthy changes in version 2.0.7
  * Made it work on Windows Vista.  Note that the entire Windows port
    is still considered Beta.
 
- * Add new options min-passphrase-nonalpha, check-passphrase-pattern
-   and enforce-passphrase-constraints to gpg-agent.
+ * Add new options min-passphrase-nonalpha, check-passphrase-pattern,
+   enforce-passphrase-constraints and max-passphrase-days to
+   gpg-agent.
 
 
 Noteworthy changes in version 2.0.6 (2007-08-16)
diff --git a/agent/ChangeLog b/agent/ChangeLog
index 4b8d5d3b1..46f1a25d8 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,21 @@
+2007-08-28  Werner Koch  <wk@g10code.com>
+
+	* gpg-agent.c (main): Add option --faked-system-time.
+
+	* protect-tool.c (read_and_unprotect): Print the protected-at date.
+
+	* agent.h (struct server_control_s): Add member IN_PASSWD.
+	* command.c (cmd_passwd): Set it.
+	* findkey.c (try_unprotect_cb): Use it.
+
+	* protect.c (do_encryption): Replace asprintf by xtryasprint.
+	(agent_protect): Create the protected-at item.
+	(agent_unprotect): Add optional arg PROTECTED_AT.
+	(merge_lists): Add args CUTOFF and CUTLEN.
+	(agent_unprotect): Use them.
+	* findkey.c (try_unprotect_cb): Add code to test for expired keys.
+	(unprotect): Allow changing the passphrase.
+
 2007-08-27  Werner Koch  <wk@g10code.com>
 
 	* gpg-agent.c: Add options --min-passphrase-nonalpha,
diff --git a/agent/agent.h b/agent/agent.h
index 8531f395a..c37a22c3d 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -88,7 +88,12 @@ struct
   unsigned int min_passphrase_nonalpha;
   /* File name with a patternfile or NULL if not enabled.  */
   const char *check_passphrase_pattern;
-
+  /* If not 0 the user is asked to change his passphrase after these
+     number of days.  */
+  unsigned int max_passphrase_days;
+  /* If set, a passphrase history will be written and checked at each
+     passphrase change.  */
+  int enable_passhrase_history;
 
   int running_detached; /* We are running detached from the tty. */
 
@@ -153,6 +158,8 @@ struct server_control_s
 
   int use_auth_call; /* Hack to send the PKAUTH command instead of the
                         PKSIGN command to the scdaemon.  */
+  int in_passwd;     /* Hack to inhibit enforced passphrase change
+                        during an explicit passwd command.  */
 };
 
 
@@ -182,7 +189,7 @@ enum
 /* Values for the cache_mode arguments. */
 typedef enum 
   {
-    CACHE_MODE_IGNORE = 0, /* Special mode to by pass the cache. */
+    CACHE_MODE_IGNORE = 0, /* Special mode to bypass the cache. */
     CACHE_MODE_ANY,        /* Any mode except ignore matches. */
     CACHE_MODE_NORMAL,     /* Normal cache (gpg-agent). */
     CACHE_MODE_USER,       /* GET_PASSPHRASE related cache. */
@@ -271,6 +278,7 @@ int agent_protect_and_store (ctrl_t ctrl, gcry_sexp_t s_skey);
 int agent_protect (const unsigned char *plainkey, const char *passphrase,
                    unsigned char **result, size_t *resultlen);
 int agent_unprotect (const unsigned char *protectedkey, const char *passphrase,
+                     gnupg_isotime_t protected_at, 
                      unsigned char **result, size_t *resultlen);
 int agent_private_key_type (const unsigned char *privatekey);
 unsigned char *make_shadow_info (const char *serialno, const char *idstring);
diff --git a/agent/command.c b/agent/command.c
index 56492e107..bb3d52fbb 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -1039,6 +1039,7 @@ cmd_passwd (assuan_context_t ctx, char *line)
   if (rc)
     goto leave;
 
+  ctrl->in_passwd++;
   rc = agent_key_from_file (ctrl, ctrl->server_local->keydesc,
                             grip, &shadow_info, CACHE_MODE_IGNORE, &s_skey);
   if (rc)
@@ -1050,6 +1051,7 @@ cmd_passwd (assuan_context_t ctx, char *line)
     }
   else
     rc = agent_protect_and_store (ctrl, s_skey);
+  ctrl->in_passwd--;
 
   xfree (ctrl->server_local->keydesc);
   ctrl->server_local->keydesc = NULL;
diff --git a/agent/findkey.c b/agent/findkey.c
index d8dc52696..183af2c5e 100644
--- a/agent/findkey.c
+++ b/agent/findkey.c
@@ -1,5 +1,6 @@
-/* findkey.c - locate the secret key
- * Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* findkey.c - Locate the secret key
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005,
+ *               2007  Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -31,15 +32,20 @@
 #include <pth.h> /* (we use pth_sleep) */
 
 #include "agent.h"
+#include "i18n.h"
 
 #ifndef O_BINARY
 #define O_BINARY 0
 #endif
 
 /* Helper to pass data to the check callback of the unprotect function. */
-struct try_unprotect_arg_s {
+struct try_unprotect_arg_s 
+{
+  ctrl_t ctrl;
   const unsigned char *protected_key;
   unsigned char *unprotected_key;
+  int change_required; /* Set by the callback to indicate that the
+                          user should chnage the passphrase.  */
 };
 
 
@@ -132,10 +138,71 @@ try_unprotect_cb (struct pin_entry_info_s *pi)
 {
   struct try_unprotect_arg_s *arg = pi->check_cb_arg;
   size_t dummy;
+  gpg_error_t err;
+  gnupg_isotime_t now, protected_at, tmptime;
+  char *desc = NULL;
 
   assert (!arg->unprotected_key);
-  return agent_unprotect (arg->protected_key, pi->pin,
-                          &arg->unprotected_key, &dummy);
+
+  arg->change_required = 0;
+  err = agent_unprotect (arg->protected_key, pi->pin, protected_at,
+                         &arg->unprotected_key, &dummy);
+  if (err)
+    return err;
+  if (!opt.max_passphrase_days || arg->ctrl->in_passwd)
+    return 0;  /* No regular passphrase change required.  */
+
+  if (!*protected_at)
+    {
+      /* No protection date known - must force passphrase change.  */
+      desc = xtrystrdup (_("Note: This passphrase has never been changed.%0A"
+                           "Please change it now."));
+      if (!desc)
+        return gpg_error_from_syserror ();
+    }
+  else
+    {
+      gnupg_get_isotime (now);
+      gnupg_copy_time (tmptime, protected_at);
+      err = add_days_to_isotime (tmptime, opt.max_passphrase_days);
+      if (err)
+        return err;
+      if (strcmp (now, tmptime) > 0 )
+        {
+          /* Passphrase "expired".  */
+          desc = xtryasprintf 
+            (_("This passphrase has not been changed%%0A"
+               "since %.4s-%.2s-%.2s.  Please change it now."),
+             protected_at, protected_at+4, protected_at+6);
+          if (!desc)
+            return gpg_error_from_syserror ();
+        }
+    }
+
+  if (desc)
+    {
+      /* Change required.  */
+      if (opt.enforce_passphrase_constraints)
+        {
+          err = agent_get_confirmation (arg->ctrl, desc,
+                                        _("Change passphrase"), NULL);
+          if (!err)
+            arg->change_required = 1;
+        }
+      else
+        {
+          err = agent_get_confirmation (arg->ctrl, desc,
+                                        _("Change passphrase"),
+                                        _("I'll change it later"));
+          if (!err)
+            arg->change_required = 1;
+          else if (gpg_err_code (err) == GPG_ERR_CANCELED)
+            err = 0;
+        }
+      xfree (desc);
+    }
+
+  return 0;
 }
 
 
@@ -260,7 +327,7 @@ unprotect (ctrl_t ctrl, const char *desc_text,
       pw = agent_get_cache (hexgrip, cache_mode, &cache_marker);
       if (pw)
         {
-          rc = agent_unprotect (*keybuf, pw, &result, &resultlen);
+          rc = agent_unprotect (*keybuf, pw, NULL, &result, &resultlen);
           agent_unlock_cache_entry (&cache_marker);
           if (!rc)
             {
@@ -272,7 +339,7 @@ unprotect (ctrl_t ctrl, const char *desc_text,
         }
 
       /* If the pinentry is currently in use, we wait up to 60 seconds
-         for it close and check the cache again.  This solves a common
+         for it to close and check the cache again.  This solves a common
          situation where several requests for unprotecting a key have
          been made but the user is still entering the passphrase for
          the first request.  Because all requests to agent_askpin are
@@ -294,7 +361,7 @@ unprotect (ctrl_t ctrl, const char *desc_text,
           /* Timeout - better call pinentry now the plain way. */
         }
     }
-  
+
   pi = gcry_calloc_secure (1, sizeof (*pi) + 100);
   if (!pi)
     return gpg_error_from_syserror ();
@@ -303,14 +370,46 @@ unprotect (ctrl_t ctrl, const char *desc_text,
   pi->max_digits = 8;
   pi->max_tries = 3;
   pi->check_cb = try_unprotect_cb;
+  arg.ctrl = ctrl;
   arg.protected_key = *keybuf;
   arg.unprotected_key = NULL;
+  arg.change_required = 0;
   pi->check_cb_arg = &arg;
 
   rc = agent_askpin (ctrl, desc_text, NULL, NULL, pi);
   if (!rc)
     {
       assert (arg.unprotected_key);
+      if (arg.change_required)
+        {
+          size_t canlen, erroff;
+          gcry_sexp_t s_skey;
+          
+          assert (arg.unprotected_key);
+          canlen = gcry_sexp_canon_len (arg.unprotected_key, 0, NULL, NULL);
+          rc = gcry_sexp_sscan (&s_skey, &erroff,
+                                (char*)arg.unprotected_key, canlen);
+          if (rc)
+            {
+              log_error ("failed to build S-Exp (off=%u): %s\n",
+                         (unsigned int)erroff, gpg_strerror (rc));
+              wipememory (arg.unprotected_key, canlen);
+              xfree (arg.unprotected_key);
+              xfree (pi);
+              return rc;
+            }
+          rc = agent_protect_and_store (ctrl, s_skey);
+          gcry_sexp_release (s_skey);
+          if (rc)
+            {
+              log_error ("changing the passphrase failed: %s\n", 
+                         gpg_strerror (rc));
+              wipememory (arg.unprotected_key, canlen);
+              xfree (arg.unprotected_key);
+              xfree (pi);
+              return rc;
+            }
+        }
       agent_put_cache (hexgrip, cache_mode, pi->pin, 0);
       xfree (*keybuf);
       *keybuf = arg.unprotected_key;
diff --git a/agent/genkey.c b/agent/genkey.c
index 09cd9f738..11b093d86 100644
--- a/agent/genkey.c
+++ b/agent/genkey.c
@@ -1,4 +1,4 @@
-/* pksign.c - Generate a keypair
+/* genkey.c - Generate a keypair
  *	Copyright (C) 2002, 2003, 2004, 2007 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 453e9a9d5..64424d975 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -92,8 +92,11 @@ enum cmd_and_opt_values
   oMinPassphraseLen,
   oMinPassphraseNonalpha,
   oCheckPassphrasePattern,
+  oMaxPassphraseDays,
+  oEnablePassphraseHistory,
   oUseStandardSocket,
   oNoUseStandardSocket,
+  oFakedSystemTime,
 
   oIgnoreCacheForSigning,
   oAllowMarkTrusted,
@@ -137,6 +140,7 @@ static ARGPARSE_OPTS opts[] = {
   { oScdaemonProgram, "scdaemon-program", 2 ,
                                N_("|PGM|use PGM as the SCdaemon program") },
   { oDisableScdaemon, "disable-scdaemon", 0, N_("do not use the SCdaemon") },
+  { oFakedSystemTime, "faked-system-time", 2, "@" }, /* (epoch time) */
 
   { oDisplay,    "display",     2, "@" },
   { oTTYname,    "ttyname",     2, "@" },
@@ -157,6 +161,8 @@ static ARGPARSE_OPTS opts[] = {
   { oMinPassphraseLen, "min-passphrase-len", 4, "@" },
   { oMinPassphraseNonalpha, "min-passphrase-nonalpha", 4, "@" },
   { oCheckPassphrasePattern, "check-passphrase-pattern", 2, "@" },
+  { oMaxPassphraseDays, "max-passphrase-days", 4, "@" },
+  { oEnablePassphraseHistory, "enable-passphrase-history", 0, "@" },
 
   { oIgnoreCacheForSigning, "ignore-cache-for-signing", 0,
                                N_("do not use the PIN cache when signing")},
@@ -177,6 +183,7 @@ static ARGPARSE_OPTS opts[] = {
 #define MAX_CACHE_TTL_SSH     (120*60) /* 2 hours */
 #define MIN_PASSPHRASE_LEN    (8)      
 #define MIN_PASSPHRASE_NONALPHA (1)      
+#define MAX_PASSPHRASE_DAYS   (0)
 
 /* The timer tick used for housekeeping stuff.  For Windows we use a
    longer period as the SetWaitableTimer seems to signal earlier than
@@ -375,6 +382,8 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
       opt.min_passphrase_len = MIN_PASSPHRASE_LEN;
       opt.min_passphrase_nonalpha = MIN_PASSPHRASE_NONALPHA;
       opt.check_passphrase_pattern = NULL;
+      opt.max_passphrase_days = MAX_PASSPHRASE_DAYS;
+      opt.enable_passhrase_history = 0;
       opt.ignore_cache_for_signing = 0;
       opt.allow_mark_trusted = 0;
       opt.disable_scdaemon = 0;
@@ -424,6 +433,12 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
     case oCheckPassphrasePattern:
       opt.check_passphrase_pattern = pargs->r.ret_str;
       break;
+    case oMaxPassphraseDays:
+      opt.max_passphrase_days = pargs->r.ret_ulong; 
+      break;
+    case oEnablePassphraseHistory:
+      opt.enable_passhrase_history = 1;
+      break;
 
     case oIgnoreCacheForSigning: opt.ignore_cache_for_signing = 1; break;
 
@@ -646,6 +661,15 @@ main (int argc, char **argv )
         case oUseStandardSocket: standard_socket = 1; break;
         case oNoUseStandardSocket: standard_socket = 0; break;
 
+        case oFakedSystemTime:
+          {
+            time_t faked_time = isotime2epoch (pargs.r.ret_str); 
+            if (faked_time == (time_t)(-1))
+              faked_time = (time_t)strtoul (pargs.r.ret_str, NULL, 10);
+            gnupg_set_time (faked_time, 0);
+          }
+          break;
+
         case oKeepTTY: opt.keep_tty = 1; break;
         case oKeepDISPLAY: opt.keep_display = 1; break;
 
@@ -753,6 +777,11 @@ main (int argc, char **argv )
               MIN_PASSPHRASE_NONALPHA);
       printf ("check-passphrase-pattern:%lu:\n",
               GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME);
+      printf ("max-passphrase-days:%lu:%d:\n",
+              GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME, 
+              MAX_PASSPHRASE_DAYS);
+      printf ("enable-passphrase-history:%lu:\n", 
+              GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
       printf ("no-grab:%lu:\n", 
               GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
       printf ("ignore-cache-for-signing:%lu:\n",
diff --git a/agent/keyformat.txt b/agent/keyformat.txt
index 2fa53adba..e246e888c 100644
--- a/agent/keyformat.txt
+++ b/agent/keyformat.txt
@@ -69,6 +69,7 @@ A protected key is like this:
     (n #00e0ce9..[some bytes not shown]..51#)
     (e #010001#)
     (protected mode (parms) encrypted_octet_string)
+    (protected-at <isotimestamp>)
    )
    (uri http://foo.bar x-foo:whatever_you_want)
    (comment whatever)
@@ -79,7 +80,8 @@ In this scheme the encrypted_octet_string is encrypted according to
 the algorithm described after the keyword protected; most protection
 algorithms need some parameters, which are given in a list before the
 encrypted_octet_string.  The result of the decryption process is a
-list of the secret key parameters.
+list of the secret key parameters.  The protected-at expression is
+optional; the isotimestamp is 15 bytes long (e.g. "19610711T172000").
 
 The only available protection mode for now is
 
@@ -110,12 +112,13 @@ representation) after decryption:
 )
 
 For padding reasons, random bytes are appended to this list - they can
-easily be stripped by looking for the end of the list.
+easily be stripped by looking for the end of the list. 
 
 The hash is calculated on the concatenation of the public key and
 secret key parameter lists: i.e it is required to hash the
 concatenation of these 6 canonical encoded lists for RSA, including
-the parenthesis and the algorithm keyword.
+the parenthesis, the algorithm keyword and (if used) the protected-at
+list.
 
 (rsa
  (n #00e0ce9..[some bytes not shown]..51#)
@@ -124,6 +127,7 @@ the parenthesis and the algorithm keyword.
  (p #00e861b..[some bytes not shown]..f1#)
  (q #00f7a7c..[some bytes not shown]..61#)
  (u #304559a..[some bytes not shown]..9b#)
+ (protected-at "18950523T000000")
 )
 
 After decryption the hash must be recalculated and compared against
diff --git a/agent/protect-tool.c b/agent/protect-tool.c
index b12b3809d..0e062a230 100644
--- a/agent/protect-tool.c
+++ b/agent/protect-tool.c
@@ -366,12 +366,14 @@ read_and_unprotect (const char *fname)
   unsigned char *result;
   size_t resultlen;
   char *pw;
-  
+  gnupg_isotime_t protected_at;
+
   key = read_key (fname);
   if (!key)
     return;
 
-  rc = agent_unprotect (key, (pw=get_passphrase (1, 0)), &result, &resultlen);
+  rc = agent_unprotect (key, (pw=get_passphrase (1, 0)), 
+                        protected_at, &result, &resultlen);
   release_passphrase (pw);
   xfree (key);
   if (rc)
@@ -381,7 +383,12 @@ read_and_unprotect (const char *fname)
       log_error ("unprotecting the key failed: %s\n", gpg_strerror (rc));
       return;
     }
-  
+  if (opt.verbose)
+    log_info ("key protection done at %.4s-%.2s-%.2s %.2s:%.2s:%s\n",
+              protected_at, protected_at+4, protected_at+6,
+              protected_at+9, protected_at+11, protected_at+13);
+
+
   if (opt_armor)
     {
       char *p = make_advanced (result, resultlen);
@@ -883,7 +890,8 @@ export_p12_file (const char *fname)
       unsigned char *tmpkey;
       size_t tmplen;
 
-      rc = agent_unprotect (key, (pw=get_passphrase (1, 0)), &tmpkey, &tmplen);
+      rc = agent_unprotect (key, (pw=get_passphrase (1, 0)),
+                            NULL, &tmpkey, &tmplen);
       release_passphrase (pw);
       if (rc)
         {
diff --git a/agent/protect.c b/agent/protect.c
index ce723fe9a..ebb02ac89 100644
--- a/agent/protect.c
+++ b/agent/protect.c
@@ -163,7 +163,7 @@ do_encryption (const unsigned char *protbegin, size_t protlen,
      ((<parameter_list>)(4:hash4:sha120:<hashvalue>)) + padding
 
      We always append a full block of random bytes as padding but
-     encrypt only what is needed for a full blocksize */
+     encrypt only what is needed for a full blocksize.  */
   blklen = gcry_cipher_get_algo_blklen (PROT_CIPHER);
   outlen = 2 + protlen + 2 + 6 + 6 + 23 + 2 + blklen;
   enclen = outlen/blklen * blklen;
@@ -229,21 +229,13 @@ do_encryption (const unsigned char *protbegin, size_t protlen,
        encrypted_octet_string)
        
      in canoncical format of course.  We use asprintf and %n modifier
-     and spaces as palceholders.  */
-  asprintf (&p,
-            "(9:protected%d:%s((4:sha18:%n_8bytes_2:96)%d:%n%*s)%d:%n%*s)",
-            (int)strlen (modestr), modestr,
-            &saltpos, 
-            blklen, &ivpos, blklen, "",
-            enclen, &encpos, enclen, "");
-  if (p)
-    { /* asprintf does not use our malloc system */
-      char *psave = p;
-      p = xtrymalloc (strlen (psave)+1);
-      if (p)
-        strcpy (p, psave);
-      free (psave);
-    }
+     and dummy values as placeholders.  */
+  p = xtryasprintf
+    ("(9:protected%d:%s((4:sha18:%n_8bytes_2:96)%d:%n%*s)%d:%n%*s)",
+     (int)strlen (modestr), modestr,
+     &saltpos, 
+     blklen, &ivpos, blklen, "",
+     enclen, &encpos, enclen, "");
   if (!p)
     {
       gpg_error_t tmperr = out_of_core ();
@@ -276,11 +268,19 @@ agent_protect (const unsigned char *plainkey, const char *passphrase,
   size_t n;
   int c, infidx, i;
   unsigned char hashvalue[20];
+  char timestamp_exp[35];
   unsigned char *protected;
   size_t protectedlen;
   int depth = 0;
   unsigned char *p;
+  gcry_md_hd_t md;
 
+  /* Create an S-expression with the procted-at timestamp.  */
+  memcpy (timestamp_exp, "(12:protected-at15:", 19);
+  gnupg_get_isotime (timestamp_exp+19);
+  timestamp_exp[19+15] = ')';
+
+  /* Parse original key.  */
   s = plainkey;
   if (*s != '(')
     return gpg_error (GPG_ERR_INV_SEXP);
@@ -345,8 +345,18 @@ agent_protect (const unsigned char *plainkey, const char *passphrase,
   assert (!depth);
   real_end = s-1;
 
-  gcry_md_hash_buffer (GCRY_MD_SHA1, hashvalue,
-                       hash_begin, hash_end - hash_begin + 1);
+  
+  /* Hash the stuff.  Because the timestamp_exp won't get protected,
+     we can't simply hash a continuous buffer but need to use several
+     md_writes.  */ 
+  rc = gcry_md_open (&md, GCRY_MD_SHA1, 0 );
+  if (rc)
+    return rc;
+  gcry_md_write (md, hash_begin, hash_end - hash_begin);
+  gcry_md_write (md, timestamp_exp, 35);
+  gcry_md_write (md, ")", 1);
+  memcpy (hashvalue, gcry_md_read (md, GCRY_MD_SHA1), 20);
+  gcry_md_close (md);
 
   rc = do_encryption (prot_begin, prot_end - prot_begin + 1,
                       passphrase,  hashvalue,
@@ -356,10 +366,12 @@ agent_protect (const unsigned char *plainkey, const char *passphrase,
 
   /* Now create the protected version of the key.  Note that the 10
      extra bytes are for for the inserted "protected-" string (the
-     beginning of the plaintext reads: "((11:private-key(" ). */
+     beginning of the plaintext reads: "((11:private-key(" ).  The 35
+     term is the space for (12:protected-at15:<timestamp>).  */
   *resultlen = (10
                 + (prot_begin-plainkey)
                 + protectedlen
+                + 35
                 + (real_end-prot_end));
   *result = p = xtrymalloc (*resultlen);
   if (!p)
@@ -374,10 +386,15 @@ agent_protect (const unsigned char *plainkey, const char *passphrase,
   p += prot_begin - plainkey - 4;
   memcpy (p, protected, protectedlen);
   p += protectedlen;
+
+  memcpy (p, timestamp_exp, 35);
+  p += 35;
+
   memcpy (p, prot_end+1, real_end - prot_end);
   p += real_end - prot_end;
   assert ( p - *result == *resultlen);
   xfree (protected);
+
   return 0;
 }
 
@@ -457,13 +474,16 @@ do_decryption (const unsigned char *protected, size_t protectedlen,
 /* Merge the parameter list contained in CLEARTEXT with the original
    protect lists PROTECTEDKEY by replacing the list at REPLACEPOS.
    Return the new list in RESULT and the MIC value in the 20 byte
-   buffer SHA1HASH. */
+   buffer SHA1HASH.  CUTOFF and CUTLEN will receive the offset and the
+   length of the resulting list which should go into the MIC
+   calculation but then be removed.  */
 static int
 merge_lists (const unsigned char *protectedkey,
              size_t replacepos, 
              const unsigned char *cleartext,
              unsigned char *sha1hash,
-             unsigned char **result, size_t *resultlen)
+             unsigned char **result, size_t *resultlen,
+             size_t *cutoff, size_t *cutlen)
 {
   size_t n, newlistlen;
   unsigned char *newlist, *p;
@@ -473,6 +493,8 @@ merge_lists (const unsigned char *protectedkey,
   
   *result = NULL;
   *resultlen = 0;
+  *cutoff = 0;
+  *cutlen = 0;
 
   if (replacepos < 26)
     return gpg_error (GPG_ERR_BUG);
@@ -522,7 +544,7 @@ merge_lists (const unsigned char *protectedkey,
     goto invalid_sexp;
   endpos = s;
   s++;
-  /* short intermezzo: Get the MIC */
+  /* Intermezzo: Get the MIC */
   if (*s != '(')
     goto invalid_sexp;
   s++;
@@ -539,13 +561,13 @@ merge_lists (const unsigned char *protectedkey,
   s += n;
   if (*s != ')')
     goto invalid_sexp;
-  /* end intermezzo */
+  /* End intermezzo */
 
   /* append the parameter list */
   memcpy (p, startpos, endpos - startpos);
   p += endpos - startpos;
   
-  /* skip overt the protected list element in the original list */
+  /* Skip over the protected list element in the original list.  */
   s = protectedkey + replacepos;
   assert (*s == '(');
   s++;
@@ -553,6 +575,22 @@ merge_lists (const unsigned char *protectedkey,
   rc = sskip (&s, &i);
   if (rc)
     goto failure;
+  /* Record the position of the optional protected-at expression.  */
+  if (*s == '(')
+    {
+      const unsigned char *save_s = s;
+      s++;
+      n = snext (&s);
+      if (smatch (&s, n, "protected-at"))
+        {
+          i = 1;
+          rc = sskip (&s, &i);
+          if (rc)
+            goto failure;
+          *cutlen = s - save_s;
+        }
+      s = save_s;
+    }
   startpos = s;
   i = 2; /* we are inside this level */
   rc = sskip (&s, &i);
@@ -561,9 +599,12 @@ merge_lists (const unsigned char *protectedkey,
   assert (s[-1] == ')');
   endpos = s; /* one behind the end of the list */
 
-  /* append the rest */
+  /* Append the rest. */
+  if (*cutlen)
+    *cutoff = p - newlist;
   memcpy (p, startpos, endpos - startpos);
   p += endpos - startpos;
+  
 
   /* ready */
   *result = newlist;
@@ -584,13 +625,16 @@ merge_lists (const unsigned char *protectedkey,
 
 
 /* Unprotect the key encoded in canonical format.  We assume a valid
-   S-Exp here. */
+   S-Exp here.  If a protected-at item is available, its value will
+   be stored at protocted_at unless this is NULL.  */
 int 
 agent_unprotect (const unsigned char *protectedkey, const char *passphrase,
+                 gnupg_isotime_t protected_at, 
                  unsigned char **result, size_t *resultlen)
 {
   int rc;
   const unsigned char *s;
+  const unsigned char *protect_list; 
   size_t n;
   int infidx, i;
   unsigned char sha1hash[20], sha1hash2[20];
@@ -601,6 +645,10 @@ agent_unprotect (const unsigned char *protectedkey, const char *passphrase,
   unsigned char *cleartext;
   unsigned char *final;
   size_t finallen;
+  size_t cutoff, cutlen;
+
+  if (protected_at)
+    *protected_at = 0;
 
   s = protectedkey;
   if (*s != '(')
@@ -624,12 +672,44 @@ agent_unprotect (const unsigned char *protectedkey, const char *passphrase,
   if (!protect_info[infidx].algo)
     return gpg_error (GPG_ERR_UNSUPPORTED_ALGORITHM); 
 
+
+  /* See wether we have a protected-at timestamp.  */
+  protect_list = s;  /* Save for later.  */
+  if (protected_at)
+    {
+      while (*s == '(')
+        {
+          prot_begin = s;
+          s++;
+          n = snext (&s);
+          if (!n)
+            return gpg_error (GPG_ERR_INV_SEXP);
+          if (smatch (&s, n, "protected-at"))
+            {
+              n = snext (&s);
+              if (!n)
+                return gpg_error (GPG_ERR_INV_SEXP);
+              if (n != 15)
+                return gpg_error (GPG_ERR_UNKNOWN_SEXP);
+              memcpy (protected_at, s, 15);
+              protected_at[15] = 0;
+              break;
+            }
+          s += n;
+          i = 1;
+          rc = sskip (&s, &i);
+          if (rc)
+            return rc;
+        }
+    }
+
   /* Now find the list with the protected information.  Here is an
      example for such a list:
      (protected openpgp-s2k3-sha1-aes-cbc 
         ((sha1 <salt> <count>) <Initialization_Vector>)
         <encrypted_data>)
    */
+  s = protect_list;
   for (;;)
     {
       if (*s != '(')
@@ -700,7 +780,7 @@ agent_unprotect (const unsigned char *protectedkey, const char *passphrase,
     return rc;
 
   rc = merge_lists (protectedkey, prot_begin-protectedkey, cleartext,
-                    sha1hash, &final, &finallen);
+                    sha1hash, &final, &finallen, &cutoff, &cutlen);
   /* Albeit cleartext has been allocated in secure memory and thus
      xfree will wipe it out, we do an extra wipe just in case
      somethings goes badly wrong. */
@@ -718,6 +798,13 @@ agent_unprotect (const unsigned char *protectedkey, const char *passphrase,
       xfree (final);
       return rc;
     }
+  /* Now remove tha part which is included in the MIC but should not
+     go into the final thing.  */
+  if (cutlen)
+    {
+      memmove (final+cutoff, final+cutoff+cutlen, finallen-cutoff-cutlen);
+      finallen -= cutlen;
+    }
 
   *result = final;
   *resultlen = gcry_sexp_canon_len (final, 0, NULL, NULL);
diff --git a/common/ChangeLog b/common/ChangeLog
index dd38733b5..7f6174340 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-28  Werner Koch  <wk@g10code.com>
+
+	* gettime.c (check_isotime, add_isotime): New.  Orginally written
+	for DirMngr by me.
+	(add_days_to_isotime): New.
+	(date2jd, jd2date, days_per_month, days_per_year): New. Taken from
+	my ancient (1988) code used in Wedit (time2.c).
+
 2007-08-27  Werner Koch  <wk@g10code.com>
 
 	* util.h (GNUPG_MODULE_NAME_CHECK_PATTERN): New.
diff --git a/common/gettime.c b/common/gettime.c
index 1814826c0..6b7411b2a 100644
--- a/common/gettime.c
+++ b/common/gettime.c
@@ -30,6 +30,10 @@
 static unsigned long timewarp;
 static enum { NORMAL = 0, FROZEN, FUTURE, PAST } timemode;
 
+/* Correction used to map to real Julian days. */
+#define JD_DIFF 1721060L
+
+
 /* Wrapper for the time(3).  We use this here so we can fake the time
    for tests */
 time_t 
@@ -363,14 +367,215 @@ asctimestamp( u32 stamp )
 
 
 
+static int
+days_per_year (int y)
+{
+  int s ;
+
+  s = !(y % 4);
+  if ( !(y % 100))
+    if ((y%400))
+      s = 0;
+  return s ? 366 : 365;
+}
+
+static int
+days_per_month (int y, int m)
+{
+  int s;
+    
+  switch(m)
+    {
+    case 1: case 3: case 5: case 7: case 8: case 10: case 12:
+      return 31 ;
+    case 2:
+      s = !(y % 4);
+      if (!(y % 100))
+        if ((y % 400))
+          s = 0;
+      return s? 29 : 28 ;
+    case 4: case 6: case 9: case 11:
+      return 30;
+    }
+  BUG();
+}
+
+
+/* Convert YEAR, MONTH and DAY into the Julian date.  We assume that
+   it is already noon; we dont; support dates before 1582-10-15. */
+static unsigned long
+date2jd (int year, int month, int day)
+{
+  unsigned long jd;
+
+  jd = 365L * year + 31 * (month-1) + day + JD_DIFF;
+  if (month < 3)
+    year-- ;
+  else
+    jd -= (4 * month + 23) / 10;
+
+  jd += year / 4 - ((year / 100 + 1) *3) / 4;
+
+  return jd ;
+}
+
+/* Convert a Julian date back to YEAR, MONTH and DAY.  Return day of
+   the year or 0 on error.  This function uses some more or less
+   arbitrary limits, most important is that days before 1582 are not
+   supported. */
+static int
+jd2date (unsigned long jd, int *year, int *month, int *day)
+{
+  int y, m, d;
+  long delta;
+
+  if (!jd)
+    return 0 ;
+  if (jd < 1721425 || jd > 2843085)
+    return 0;
+
+  y = (jd - JD_DIFF) / 366;
+  d = m = 1;
+
+  while ((delta = jd - date2jd (y, m, d)) > days_per_year (y))
+    y++;
+
+  m = (delta / 31) + 1;
+  while( (delta = jd - date2jd (y, m, d)) > days_per_month (y,m))
+    if (++m > 12)
+      { 
+        m = 1;
+        y++;
+      }
+
+  d = delta + 1 ;
+  if (d > days_per_month (y, m))
+    { 
+      d = 1;
+      m++;
+    }
+  if (m > 12)
+    { 
+      m = 1;
+      y++;
+    }
+
+  if (year)
+    *year = y;
+  if (month)
+    *month = m;
+  if (day)
+    *day = d ;
+
+  return (jd - date2jd (y, 1, 1)) + 1;
+}
+
+
+/* Check that the 15 bytes in ATIME represent a valid ISO time.  Note
+   that this function does not expect a string but a plain 15 byte
+   isotime buffer. */
+gpg_error_t
+check_isotime (const gnupg_isotime_t atime)
+{
+  int i;
+  const char *s;
+
+  if (!*atime)
+    return gpg_error (GPG_ERR_NO_VALUE);
+  
+  for (s=atime, i=0; i < 8; i++, s++)
+    if (!digitp (s))
+      return gpg_error (GPG_ERR_INV_TIME);
+  if (*s != 'T')
+      return gpg_error (GPG_ERR_INV_TIME);
+  for (s++, i=9; i < 15; i++, s++)
+    if (!digitp (s))
+      return gpg_error (GPG_ERR_INV_TIME);
+  return 0;
+}
 
 
 
+/* Add SECONDS to ATIME.  SECONDS may not be negative and is limited
+   to about the equivalent of 62 years which should be more then
+   enough for our purposes. */
+gpg_error_t
+add_seconds_to_isotime (gnupg_isotime_t atime, int nseconds)
+{
+  gpg_error_t err;
+  int year, month, day, hour, minute, sec, ndays;
+  unsigned long jd;
+
+  err = check_isotime (atime);
+  if (err)
+    return err;
+
+  if (nseconds < 0 || nseconds >= (0x7fffffff - 61) )
+    return gpg_error (GPG_ERR_INV_VALUE);
+
+  year  = atoi_4 (atime+0);
+  month = atoi_2 (atime+4);
+  day   = atoi_2 (atime+6);
+  hour  = atoi_2 (atime+9);
+  minute= atoi_2 (atime+11);
+  sec   = atoi_2 (atime+13);
+
+  if (year <= 1582) /* The julian date functions don't support this. */
+    return gpg_error (GPG_ERR_INV_VALUE); 
+
+  sec    += nseconds;
+  minute += sec/60;
+  sec    %= 60;
+  hour   += minute/60;
+  minute %= 60;
+  ndays  = hour/24;
+  hour   %= 24;
+  
+  jd = date2jd (year, month, day) + ndays;
+  jd2date (jd, &year, &month, &day);
+
+  if (year > 9999 || month > 12 || day > 31
+      || year < 0 || month < 1 || day < 1)
+    return gpg_error (GPG_ERR_INV_VALUE); 
+    
+  snprintf (atime, 16, "%04d%02d%02dT%02d%02d%02d",
+            year, month, day, hour, minute, sec);
+  return 0;
+}
 
 
+gpg_error_t
+add_days_to_isotime (gnupg_isotime_t atime, int ndays)
+{
+  gpg_error_t err;
+  int year, month, day, hour, minute, sec;
+  unsigned long jd;
 
+  err = check_isotime (atime);
+  if (err)
+    return err;
 
+  if (ndays < 0 || ndays >= 9999*366 )
+    return gpg_error (GPG_ERR_INV_VALUE);
 
+  year  = atoi_4 (atime+0);
+  month = atoi_2 (atime+4);
+  day   = atoi_2 (atime+6);
+  hour  = atoi_2 (atime+9);
+  minute= atoi_2 (atime+11);
+  sec   = atoi_2 (atime+13);
 
+  if (year <= 1582) /* The julian date functions don't support this. */
+    return gpg_error (GPG_ERR_INV_VALUE); 
 
+  jd = date2jd (year, month, day) + ndays;
+  jd2date (jd, &year, &month, &day);
 
+  if (year > 9999 || month > 12 || day > 31
+      || year < 0 || month < 1 || day < 1)
+    return gpg_error (GPG_ERR_INV_VALUE); 
+    
+  snprintf (atime, 16, "%04d%02d%02dT%02d%02d%02d",
+            year, month, day, hour, minute, sec);
+  return 0;
+}
diff --git a/common/util.h b/common/util.h
index 937918308..75f6ed05c 100644
--- a/common/util.h
+++ b/common/util.h
@@ -110,7 +110,9 @@ const char *strtimevalue (u32 stamp);
 const char *strtimestamp (u32 stamp); /* GMT */
 const char *isotimestamp (u32 stamp); /* GMT */
 const char *asctimestamp (u32 stamp); /* localized */
-
+gpg_error_t add_seconds_to_isotime (gnupg_isotime_t atime, int nseconds);
+gpg_error_t add_days_to_isotime (gnupg_isotime_t atime, int ndays);
+gpg_error_t check_isotime (const gnupg_isotime_t atime);
 
 /* Copy one ISO date to another, this is inline so that we can do a
    sanity check. */
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 9751eee78..0dbf9ad39 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -365,6 +365,15 @@ a policy.  A better policy is to educate users on good security
 behavior and optional to run a passphrase cracker regularly on all
 users passphrases t catch the very simple ones.
 
+@item --max-passphrase-days @var{n}
+@opindex max-passphrase-days 
+Ask the user to change the passphrase if @var{n} days have passed since
+the last change.  With @option{--enforce-passphrase-constraints} set the
+user may not bypass this check.
+
+@item --enable-passphrase-history
+@opindex enable-passphrase-history
+This option does nothing yet.
 
 @item --pinentry-program @var{filename}
 @opindex pinentry-program
diff --git a/po/ChangeLog b/po/ChangeLog
index 5cd73b7c3..c620d54b4 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-28  Werner Koch  <wk@g10code.com>
+
+	* de.po: Updated.
+
 2007-08-16  Werner Koch  <wk@g10code.com>
 
 	* pt_BR.po, es.po: Remove the "GNU" from the project ID.  That
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c821a7a78..a991fb49d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,6 +8,7 @@ agent/gpg-agent.c
 agent/preset-passphrase.c
 agent/protect-tool.c
 agent/trustlist.c
+agent/findkey.c
 
 common/exechelp.c
 common/http.c
diff --git a/po/be.po b/po/be.po
index 09c85b40c..5b543771f 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-08-16 11:04+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\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"
@@ -20,52 +20,52 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: agent/call-pinentry.c:436
+#: agent/call-pinentry.c:438
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:439
+#: agent/call-pinentry.c:441
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 
-#: agent/call-pinentry.c:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 #, fuzzy
 msgid "PIN too long"
 msgstr "пароль занадта доўгі\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "пароль занадта доўгі\n"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 msgid "Invalid characters in PIN"
 msgstr ""
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Bad PIN"
 msgstr "дрэнны MPI"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "дрэнны пароль"
 
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 #, fuzzy
 msgid "Passphrase"
 msgstr "дрэнны пароль"
@@ -161,7 +161,27 @@ msgstr ""
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Увядзіце пароль\n"
+
+#: agent/genkey.c:165
+msgid "Take this one anyway"
+msgstr ""
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -172,49 +192,64 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:98
-msgid "Take this one anyway"
+#: agent/genkey.c:202
+#, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:225
+#, 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 ""
 
-#: agent/genkey.c:99 agent/genkey.c:114
-#, fuzzy
-msgid "Enter new passphrase"
-msgstr "Увядзіце пароль\n"
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
 
-#: agent/genkey.c:107
+#: agent/genkey.c:240
 #, 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:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: 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:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: 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:280
+#: agent/genkey.c:412
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "Паўтарыце пароль\n"
 
-#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
@@ -225,241 +260,241 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "шматслоўнасьць"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "працаваць менш шматслоўна"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr ""
 
-#: agent/gpg-agent.c:129
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 msgid "do not use the SCdaemon"
 msgstr ""
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:172
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "Паўтарыце пароль\n"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Калі ласка, паведамляйце пра памылкі на <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:276
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: agent/gpg-agent.c:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: тэчка створана\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: agent/gpg-agent.c:1381
+#: agent/gpg-agent.c:1438
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1549
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1554
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1571
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1519
+#: agent/gpg-agent.c:1576
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, c-format
 msgid "%s %s stopped\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -487,37 +522,37 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1190
+#: agent/protect-tool.c:1213
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "дрэнны пароль"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr ""
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "скасавана карыстальнікам\n"
@@ -569,8 +604,8 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -580,7 +615,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr ""
 
@@ -592,58 +627,79 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 #, fuzzy
 msgid "Yes"
 msgstr "yes [так]"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr ""
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+
+#: agent/findkey.c:188 agent/findkey.c:195
+#, fuzzy
+msgid "Change passphrase"
+msgstr "дрэнны пароль"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr ""
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
@@ -684,17 +740,17 @@ msgstr "скасавана карыстальнікам\n"
 msgid "problem with the agent\n"
 msgstr ""
 
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr ""
 
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
@@ -1451,7 +1507,7 @@ msgstr "%s: немагчыма стварыць тэчку: %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1584,7 +1640,7 @@ msgstr ""
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1619,7 +1675,7 @@ msgstr ""
 msgid "use as output file"
 msgstr "выкарыстоўваць у якасьці файла вываду"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "не рабіць ніякіх зьменаў"
 
@@ -2543,12 +2599,12 @@ msgstr ""
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr ""
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr ""
@@ -2573,22 +2629,22 @@ msgstr ""
 msgid "   new key revocations: %lu\n"
 msgstr ""
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr ""
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr ""
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr ""
@@ -3684,12 +3740,12 @@ msgid ""
 msgstr ""
 
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr ""
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr ""
 
@@ -3744,7 +3800,7 @@ msgstr ""
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 msgid "invalid"
 msgstr ""
 
@@ -4856,7 +4912,7 @@ msgstr ""
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 #, fuzzy
 msgid "unknown"
 msgstr "невядомая вэрсыя"
@@ -4918,66 +4974,66 @@ msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr ""
 "па больш падрабязныя зьвесткі шукайце на http://www.gnupg.org/faq.html\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr ""
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:737
+#: g10/misc.c:739
 msgid "Uncompressed"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1047
+#: g10/misc.c:1049
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr ""
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "невядомая вэрсыя"
@@ -5761,7 +5817,7 @@ msgstr ""
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr ""
@@ -5806,7 +5862,7 @@ msgstr "памылка стварэньня \"%s\": %s\n"
 msgid "read error in `%s': %s\n"
 msgstr "памылка чытаньня файла"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
@@ -5949,164 +6005,164 @@ msgstr ""
 msgid "input line longer than %d characters\n"
 msgstr ""
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr ""
 
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr ""
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr ""
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr ""
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 #, fuzzy
 msgid "[ revoked]"
 msgstr "памылка чытаньня файла"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 #, fuzzy
 msgid "[ expired]"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ unknown]"
 msgstr "невядомая вэрсыя"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 msgid "checking the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6153,25 +6209,25 @@ msgstr "немагчыма адкрыць %s: %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "Калі ласка, паведамляйце пра памылкі на <gnupg-bugs@gnu.org>.\n"
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -6646,7 +6702,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
@@ -6860,16 +6916,6 @@ msgstr "збой падпісаньня: %s\n"
 msgid "no valid recipients given\n"
 msgstr ""
 
-#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "памылка стварэньня \"%s\": %s\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "памылка стварэньня \"%s\": %s\n"
-
 #: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
@@ -7009,7 +7055,7 @@ msgstr "выдаліць ключы са зьвязку грамадскіх к
 msgid "add this secret keyring to the list"
 msgstr ""
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
 
@@ -7093,25 +7139,25 @@ msgstr "немагчыма адкрыць %s: %s\n"
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, c-format
 msgid "total number processed: %lu\n"
 msgstr ""
 
-#: sm/import.c:226
+#: sm/import.c:227
 msgid "error storing certificate\n"
 msgstr ""
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
@@ -7322,27 +7368,27 @@ msgstr "памылка стварэньня \"%s\": %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr ""
 
@@ -7358,56 +7404,84 @@ msgstr ""
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:521
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: tools/gpgconf-comp.c:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:533
+#, fuzzy
+msgid "|N|expire the passphrase after N days"
+msgstr ""
+"Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
+"\n"
+
+#: tools/gpgconf-comp.c:537
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "Паўтарыце пароль\n"
+
+#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 
-#: tools/gpgconf-comp.c:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index 46e53d51a..a80a38074 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-08-16 11:04+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\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"
@@ -40,54 +40,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 
-#: agent/call-pinentry.c:436
+#: agent/call-pinentry.c:438
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:439
+#: agent/call-pinentry.c:441
 #, 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:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 #, fuzzy
 msgid "PIN too long"
 msgstr "la línia és massa llarga\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "la contrasenya és massa llarga\n"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Bad PIN"
 msgstr "l'MPI és erroni"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "la contrasenya és errònia"
 
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 #, fuzzy
 msgid "Passphrase"
 msgstr "la contrasenya és errònia"
@@ -185,7 +185,28 @@ msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "error en la creació de la contrasenya: %s\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "%s: error en escriure el registre de directoris: %s\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Introduïu la contrasenya\n"
+
+#: agent/genkey.c:165
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Voleu usar de tota manera aquesta clau?"
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -196,50 +217,64 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:98
-#, fuzzy
-msgid "Take this one anyway"
-msgstr "Voleu usar de tota manera aquesta clau?"
+#: agent/genkey.c:202
+#, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] ""
+msgstr[1] ""
 
-#: agent/genkey.c:99 agent/genkey.c:114
-#, fuzzy
-msgid "Enter new passphrase"
-msgstr "Introduïu la contrasenya\n"
+#: agent/genkey.c:225
+#, 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 ""
 
-#: agent/genkey.c:107
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+
+#: agent/genkey.c:240
 #, 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:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, 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:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: 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:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: 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:280
+#: agent/genkey.c:412
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
@@ -250,248 +285,248 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
 # Un dels dos és en la llista d'opcions amb --help. Urgh. jm
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detall"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "una mica més silenciós"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: 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:129
+#: agent/gpg-agent.c:135
 #, 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:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualitza la base de dades de confiança"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:172
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 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:260
+#: agent/gpg-agent.c:276
 #, 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:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, 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:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 #, 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:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: s'ha creat el directori\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, 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:1381
+#: agent/gpg-agent.c:1438
 #, 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:1492
+#: agent/gpg-agent.c:1549
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1554
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1571
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1519
+#: agent/gpg-agent.c:1576
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, 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:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu claus es descarta\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
 
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -519,40 +554,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 #, 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:1190
+#: agent/protect-tool.c:1213
 #, 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:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 #, 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:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "la contrasenya és errònia"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, 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:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancel·la"
@@ -605,8 +640,8 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -616,7 +651,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr ""
 
@@ -628,58 +663,79 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 #, fuzzy
 msgid "Yes"
 msgstr "sí|si"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr ""
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+
+#: agent/findkey.c:188 agent/findkey.c:195
+#, fuzzy
+msgid "Change passphrase"
+msgstr "canvia la contrasenya"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr ""
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "no es pot obrir el fitxer: %s\n"
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -723,18 +779,18 @@ msgid "problem with the agent\n"
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
 
 # bolcats de memòria?  ivb
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no s'han pogut desactivar els bolcats de memòria: %s\n"
 
 # Indi. ivb
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
@@ -1541,7 +1597,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:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1676,7 +1732,7 @@ msgstr "|algo [fitxers]|imprimeix resums de missatges"
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1711,7 +1767,7 @@ msgstr "usa el mode de text canònic"
 msgid "use as output file"
 msgstr "fitxer d'eixida"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "no fa cap canvi"
 
@@ -2768,12 +2824,12 @@ msgstr " claus noves descartades: %lu\n"
 msgid "          w/o user IDs: %lu\n"
 msgstr "                sense ID: %lu\n"
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importades: %lu"
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          no modificades: %lu\n"
@@ -2798,22 +2854,22 @@ msgstr "        signatures noves: %lu\n"
 msgid "   new key revocations: %lu\n"
 msgstr "       noves revocacions: %lu\n"
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " claus privades llegides: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "claus privades importades: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claus privades no canviades: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              importades: %lu\n"
@@ -4017,13 +4073,13 @@ msgstr ""
 "correcta a no ser que torneu a executar el programa.\n"
 
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4089,7 +4145,7 @@ msgstr "S'han esborrat %d signatures.\n"
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "invàlida"
 
@@ -5289,7 +5345,7 @@ msgstr "binari"
 msgid "textmode"
 msgstr "mode text"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 msgid "unknown"
 msgstr "desconeguda"
 
@@ -5351,41 +5407,41 @@ msgstr "signatura %s, algorisme de resum %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "el mòdul de xifratge IDEA no està present\n"
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostra més informació\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: l'opció «%s» està desaconsellada.\n"
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "si us plau, utilitzeu «%s%s» en el seu lloc\n"
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
@@ -5393,7 +5449,7 @@ msgstr "AVÍS: %s és una opció desaconsellada.\n"
 # Gènere?  Nombre?  Passat, futur?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: g10/misc.c:737
+#: g10/misc.c:739
 msgid "Uncompressed"
 msgstr "No comprimit"
 
@@ -5401,22 +5457,22 @@ msgstr "No comprimit"
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "No comprimit"
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, 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:1047
+#: g10/misc.c:1049
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
@@ -6298,7 +6354,7 @@ msgstr ""
 "es descarta «%s»: és una clau ElGamal generada per PGP que no és segura per "
 "a signatures!\n"
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registre de confiança %lu, tipus %d: no s'ha pogut escriure: %s\n"
@@ -6346,7 +6402,7 @@ msgstr "error en trobar el registre de confiança: %s\n"
 msgid "read error in `%s': %s\n"
 msgstr "error de lectura: %s\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dades de confiança: no s'ha pogut sincronitzar: %s\n"
@@ -6494,174 +6550,174 @@ msgstr "no es poden tractar línies més llargues de %d caràcters\n"
 msgid "input line longer than %d characters\n"
 msgstr "la línia d'entrada és superior a %d caràcters\n"
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "«%s» no és un ID de clau llarg vàlid\n"
 
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "clau %08lX: s'accepta com a clau fiable\n"
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr ""
 "la clau %08lX apareix més d'una vegada en la base de dades de confiança\n"
 
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "clau %08lX: no hi ha una clau pública per a la clau fiable - es descarta\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "s'ha marcat la clau com a de confiança absoluta.\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registre de confiança %lu, tipus %d: no s'ha pogut llegir: %s\n"
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "el registre de confiança %lu no és del tipus demanat %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revocada]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 #, fuzzy
 msgid "[ expired]"
 msgstr "[caducada]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ unknown]"
 msgstr "desconeguda"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 #, fuzzy
 msgid "never"
 msgstr "mai       "
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr ""
 "no és necessària una comprovació de la base de dades de confiança\n"
 "\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "la pròxima comprovació de la base de dades de confiança serà el %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 "no és necessària una comprovació de la base de dades de confiança\n"
 "\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 "no és necessària una comprovació de la base de dades de confiança\n"
 "\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "no s'ha trobat la clau pública %08lX: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr "si us plau, feu un --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 msgid "checking the trustdb\n"
 msgstr "s'està comprovant la base de dades de confiança\n"
 
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "s'han processat %d claus (s'han netejat %d comptes de validesa)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 msgid "no ultimately trusted keys found\n"
 msgstr "no s'han trobat claus amb confiança absoluta\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "no s'ha trobat la clau pública de la clau amb confiança absoluta %08lX\n"
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registre de confiança %lu, tipus %d: no s'ha pogut escriure: %s\n"
@@ -6712,25 +6768,25 @@ msgstr "no es pot obrir el fitxer: %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "Si us plau, informeu sobre els errors a <gnupg-bugs@gnu.org>.\n"
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -7219,7 +7275,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Certificat de revocació vàlid"
@@ -7449,16 +7505,6 @@ 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/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "error en la creació de la contrasenya: %s\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "%s: error en escriure el registre de directoris: %s\n"
-
 #: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
@@ -7597,7 +7643,7 @@ msgstr "afegeix aquest anell a la llista"
 msgid "add this secret keyring to the list"
 msgstr "afegeix aquest anell secret a la llista"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|usa NOM com a clau secreta predeterminada"
 
@@ -7679,26 +7725,26 @@ msgstr "no s'ha pogut tancar «%s»: %s\n"
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "Nombre total processat: %lu\n"
 
-#: sm/import.c:226
+#: sm/import.c:227
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "Certificat correcte"
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -7912,27 +7958,27 @@ msgstr "error mentre s'enviava a «%s»: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr ""
 
@@ -7948,57 +7994,83 @@ msgstr ""
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:521
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: tools/gpgconf-comp.c:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:533
+#, fuzzy
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|usa el mode de contrasenya especificat"
+
+#: tools/gpgconf-comp.c:537
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "error en la creació de la contrasenya: %s\n"
+
+#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOM|xifra per a NOM"
 
-#: tools/gpgconf-comp.c:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 #, 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:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8713,9 +8785,6 @@ msgstr "l'algoritme de protecció %d%s no està suportat\n"
 #~ "estableix totes les opcions de paquets, xifratge i resum al comportament "
 #~ "de PGP 2.x"
 
-#~ msgid "|N|use passphrase mode N"
-#~ msgstr "|N|usa el mode de contrasenya especificat"
-
 #~ msgid "|NAME|use message digest algorithm NAME for passphrases"
 #~ msgstr ""
 #~ "|NOM|usa l'algoritme de resum de missatges NOM per a les contrasenyes"
diff --git a/po/cs.po b/po/cs.po
index 06c4b3f91..0a60c9281 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-08-16 11:04+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\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"
@@ -20,54 +20,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "ulo�en� fingerprintu se nezda�ilo: %s\n"
 
-#: agent/call-pinentry.c:436
+#: agent/call-pinentry.c:438
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:439
+#: agent/call-pinentry.c:441
 #, 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:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 #, fuzzy
 msgid "PIN too long"
 msgstr "��dek je p��li� dlouh�"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "��dek je p��li� dlouh�"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Neplatn� znak ve jm�n�\n"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Bad PIN"
 msgstr "�patn� MPI"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "�patn� heslo"
 
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 #, fuzzy
 msgid "Passphrase"
 msgstr "�patn� heslo"
@@ -162,7 +162,28 @@ msgstr "PIN nen
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "chyba p�i vytv��en� hesla: %s\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "%s: chyba p�i z�pisu adres��ov�ho z�znamu: %s\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Vlo�it heslo\n"
+
+#: agent/genkey.c:165
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Pou��t p�esto tento kl��? (a/N) "
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -173,50 +194,64 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:98
-#, fuzzy
-msgid "Take this one anyway"
-msgstr "Pou��t p�esto tento kl��? (a/N) "
+#: agent/genkey.c:202
+#, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] ""
+msgstr[1] ""
 
-#: agent/genkey.c:99 agent/genkey.c:114
-#, fuzzy
-msgid "Enter new passphrase"
-msgstr "Vlo�it heslo\n"
+#: agent/genkey.c:225
+#, 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 ""
 
-#: agent/genkey.c:107
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+
+#: agent/genkey.c:240
 #, 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:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, 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:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: 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:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: 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:280
+#: agent/genkey.c:412
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "zm�nit heslo"
 
-#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
@@ -227,104 +262,104 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "s dodate�n�mi informacemi"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "b�t o trochu v�c tich�"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "vyhledat kl��e na serveru kl���"
 
-#: agent/gpg-agent.c:129
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "nastavit sadu preferenc� pro vybran� u�ivatelsk� ID"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualizovat datab�zi d�v�ry"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:172
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 tools/symcryptrun.c:204
 #, fuzzy
@@ -333,142 +368,142 @@ 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:260
+#: agent/gpg-agent.c:276
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: agent/gpg-agent.c:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, 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:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nemohu vytvo�it adres�� `%s': %s\n"
 
-#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 #, 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:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, 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:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "adres�� `%s' vytvo�en\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) selhal v %s: %s\n"
 
-#: agent/gpg-agent.c:1381
+#: agent/gpg-agent.c:1438
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "nemohu vytvo�it adres�� `%s': %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1549
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1554
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1571
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1519
+#: agent/gpg-agent.c:1576
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
 
-#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: p�esko�eno: %s\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "�patn� form�t prom�nn� prost�ed� GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -496,40 +531,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 #, 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:1190
+#: agent/protect-tool.c:1213
 #, 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:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 #, 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:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "�patn� heslo"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, 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:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "zru�eno"
@@ -581,8 +616,8 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -592,7 +627,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr ""
 
@@ -604,58 +639,79 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 #, fuzzy
 msgid "Yes"
 msgstr "ano"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr ""
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+
+#: agent/findkey.c:188 agent/findkey.c:195
+#, fuzzy
+msgid "Change passphrase"
+msgstr "zm�nit heslo"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr ""
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nemohu otev��t podepsan� data '%s'\n"
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
@@ -697,18 +753,18 @@ msgstr "zru
 msgid "problem with the agent\n"
 msgstr "probl�m s agentem - pou��v�n� agenta vypnuto\n"
 
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nemohu vypnout vytv��en� core soubor�: %s\n"
 
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 "VAROV�N�: vlastnictv� roz�i�uj�c�ho modulu nen� nastaveno bezpe�n� `%s'\n"
 
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "VAROV�N�: p��stupov� pr�va roz�i�uj�c�mu modulu nejsou bezpe�n� `%s'\n"
@@ -1459,7 +1515,7 @@ msgstr "pou
 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:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1591,7 +1647,7 @@ msgstr "|algo [soubory]  vypi
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1630,7 +1686,7 @@ msgstr "pou
 msgid "use as output file"
 msgstr "pou��t jako v�stupn� soubor"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "neprov�d�t ��dn� zm�ny"
 
@@ -2683,12 +2739,12 @@ msgstr "     p
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez ID u�ivatele: %lu\n"
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "                 importov�no: %lu"
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                 beze zm�n: %lu\n"
@@ -2713,22 +2769,22 @@ msgstr "              nov
 msgid "   new key revocations: %lu\n"
 msgstr "       nov� revokace kl���: %lu\n"
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      p�e�ten� tajn� kl��e: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "   importovan� tajn� kl��e: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "     tajn� kl��e nezm�n�ny: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             neimportov�no: %lu\n"
@@ -3850,12 +3906,12 @@ msgstr ""
 "b�t nutn� spr�vn�, dokud znova nespust�te program.\n"
 
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "revokov�n"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "platnost skon�ila"
 
@@ -3914,7 +3970,7 @@ msgstr "Smaz
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smaz�no.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "neplatn�"
 
@@ -5069,7 +5125,7 @@ msgstr "bin
 msgid "textmode"
 msgstr "textov� form�t"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 msgid "unknown"
 msgstr "nezn�m� form�t"
 
@@ -5130,65 +5186,65 @@ msgstr "VAROV
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "VAROV�N�: vy��dan� algoritmus %s nen� doporu�en\n"
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA modul pro GnuPG nenalezen\n"
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "V�ce informac� naleznete na adrese http://www.gnupg.cz/faq.html\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: pou�it� parametru \"%s\" se nedoporu�uje\n"
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROV�N�: pou��v�n� parametru \"%s\" se nedoporu�uje\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "pou�ijte m�sto n�j \"%s%s\" \n"
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROV�N�: pou��v�n� p��kaz \"%s\" se nedoporu�uje - nepou��vejte jej\n"
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "VAROV�N�: pou��v�n� parametru \"%s\" se nedoporu�uje\n"
 
-#: g10/misc.c:737
+#: g10/misc.c:739
 msgid "Uncompressed"
 msgstr "Nezakomprimov�no"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 msgid "uncompressed|none"
 msgstr "nezakomprimov�no|nic"
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, 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:1047
+#: g10/misc.c:1049
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "nejednozna�n� volby `%s'\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "nezn�m� volba `%s'\n"
@@ -6018,7 +6074,7 @@ msgstr ""
 "toto je PGP kl�� vygenerovan� podle algoritmu ElGamal,\n"
 "podpisy vytvo�en� t�mto kl��em nejsou bezpe�n�!"
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "z�znam d�v�ry %lu, typ %d: z�pis selhal: %s\n"
@@ -6063,7 +6119,7 @@ msgstr "chyba p
 msgid "read error in `%s': %s\n"
 msgstr "chyba p�i �ten� v `%s': %s\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "datab�ze d�v�ry: synchronizace selhala %s\n"
@@ -6206,157 +6262,157 @@ msgstr "nemohu pracovat s 
 msgid "input line longer than %d characters\n"
 msgstr "vstupn� ��dek je del�� ne� %d znak�\n"
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' nen� platn� dlouh� keyID\n"
 
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "kl�� %s: akceptov�n jako d�v�ryhodn� kl��\n"
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "kl�� %s se v datab�zi d�v�ry vyskytuje v�ce ne� jednou\n"
 
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "kl�� %s: nenalezen ve�ejn� kl�� k d�v�ryhodn�mu kl��i - p�esko�eno\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "kl�� %s ozna�en jako absolutn� d�v�ryhodn�.\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "z�znam d�v�ry %lu, typ po�. %d: �ten� selhalo: %s\n"
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "z�znam d�v�ry %lu nen� po�adovan�ho typu %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "nelze pou��t nezn�m� model d�v�ry (%d) - p�edpokl�d�me pou�it� modelu %s\n"
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr "poui�it� modelu d�v�ry %s\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 "14 fixn� d�lka na kterou se p�ekl�d� see trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 msgid "[ revoked]"
 msgstr "[ revokov�n  ]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 msgid "[ expired]"
 msgstr "[ expirov�n  ]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 msgid "[ unknown]"
 msgstr "[  nezn�m�   ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr "[nedefinovan�]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr "[  ��ste�n�  ]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr "[    pln�    ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr "[  absolutn� ]"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr "nedefinov�na"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 msgid "never"
 msgstr "��dn�"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr "��ste�n�"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr "pln�"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr "absolutn�"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr "nen� nutn� kontrolovat datab�zi d�v�ry\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dal�� kontrola datab�ze d�v�ry v %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "nen� nutn� kontrolovat datab�zi d�v�ry s modelem `%s'\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "nen� nutn� aktualizovat datab�zi d�v�ry s modelem `%s'\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "ve�ejn� kl�� %s nebyl nalezen: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr "pros�m prove�te --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 msgid "checking the trustdb\n"
 msgstr "kontroluji datab�zi d�v�ry\n"
 
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "zpracov�no %d kl��� (%d validit vymaz�no)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 msgid "no ultimately trusted keys found\n"
 msgstr "��dn� absolutn� d�v�ryhodn� kl�� nebyl nalezen\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "ve�ejn� kl�� k absolutn� d�v�ryhodn�mu kl��i %s nebyl nalezen\n"
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "po�adov�no %d ��ste�n� d�v�ry a %d �pln� d�v�ry, model %s\n"
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6364,7 +6420,7 @@ msgstr ""
 "hloubka: %d  platn�ch: %3d  podepsan�ch: %3d  d�v�ra: %d-, %dq, %dn, %dm, %"
 "df, %du\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "nelze aktualizovat z�znam v datab�zi d�v�ry: chyba p�i z�pisu: %s\n"
@@ -6414,27 +6470,27 @@ msgstr "podeps
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "p�ejmenov�n� `%s' na `%s' se nezda�ilo: %s\n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 #, 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"
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -6910,7 +6966,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
@@ -7125,16 +7181,6 @@ msgstr "smaz
 msgid "no valid recipients given\n"
 msgstr "(Nebyl zad�n ��dn� popis)\n"
 
-#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "chyba p�i vytv��en� hesla: %s\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "%s: chyba p�i z�pisu adres��ov�ho z�znamu: %s\n"
-
 #: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
@@ -7277,7 +7323,7 @@ msgstr "ber kl
 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:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
@@ -7362,26 +7408,26 @@ msgstr "nemohu otev
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "Celkov� po�et zpracovan�ch kl���: %lu\n"
 
-#: sm/import.c:226
+#: sm/import.c:227
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "vytvo�it revoka�n� certifik�t"
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
@@ -7593,27 +7639,27 @@ msgstr "chyba p
 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:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr ""
 
@@ -7629,56 +7675,82 @@ msgstr ""
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:521
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: tools/gpgconf-comp.c:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:533
+#, fuzzy
+msgid "|N|expire the passphrase after N days"
+msgstr "revokovat kl�� nebo vybran� podkl��e"
+
+#: tools/gpgconf-comp.c:537
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "chyba p�i vytv��en� hesla: %s\n"
+
+#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|JM�NO|�ifrovat pro JM�NO"
 
-#: tools/gpgconf-comp.c:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index 6aa69f43b..3acafa02b 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-08-16 11:04+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\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"
@@ -22,51 +22,51 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: agent/call-pinentry.c:436
+#: agent/call-pinentry.c:438
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:439
+#: agent/call-pinentry.c:441
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 
-#: agent/call-pinentry.c:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 msgid "PIN too long"
 msgstr ""
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 msgid "Passphrase too long"
 msgstr ""
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Bad PIN"
 msgstr "d�rlig mpi"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "d�rlig kodes�tning"
 
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 #, fuzzy
 msgid "Passphrase"
 msgstr "d�rlig kodes�tning"
@@ -163,7 +163,28 @@ msgstr "kodes
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "fejl ved oprettelse af kodes�tning: %s\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "skriver til `%s'\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Indtast kodes�tning: "
+
+#: agent/genkey.c:165
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Brug denne n�gle alligevel? "
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -174,50 +195,64 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:98
-#, fuzzy
-msgid "Take this one anyway"
-msgstr "Brug denne n�gle alligevel? "
+#: agent/genkey.c:202
+#, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] ""
+msgstr[1] ""
 
-#: agent/genkey.c:99 agent/genkey.c:114
-#, fuzzy
-msgid "Enter new passphrase"
-msgstr "Indtast kodes�tning: "
+#: agent/genkey.c:225
+#, 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 ""
 
-#: agent/genkey.c:107
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+
+#: agent/genkey.c:240
 #, 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:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, 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:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: 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:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: 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:280
+#: agent/genkey.c:412
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
@@ -228,244 +263,244 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "meddelsom"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "v�r mere stille"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: 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:129
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "opdat�r tillidsdatabasen"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:172
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 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:260
+#: agent/gpg-agent.c:276
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: agent/gpg-agent.c:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: mappe oprettet\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: agent/gpg-agent.c:1381
+#: agent/gpg-agent.c:1438
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1549
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1554
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1571
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1519
+#: agent/gpg-agent.c:1576
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: udelod: %s\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -493,37 +528,37 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1190
+#: agent/protect-tool.c:1213
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "d�rlig kodes�tning"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, 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:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 msgid "cancelled\n"
 msgstr ""
 
@@ -574,8 +609,8 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -585,7 +620,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr ""
 
@@ -597,58 +632,79 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 #, fuzzy
 msgid "Yes"
 msgstr "ja"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr ""
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+
+#: agent/findkey.c:188 agent/findkey.c:195
+#, fuzzy
+msgid "Change passphrase"
+msgstr "�ndr kodes�tningen"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr ""
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
@@ -688,17 +744,17 @@ msgstr ""
 msgid "problem with the agent\n"
 msgstr ""
 
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan ikke sl� core-dump fra: %s\n"
 
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
@@ -1469,7 +1525,7 @@ msgstr "bruger sekund
 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:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1606,7 +1662,7 @@ msgstr "|algo [filer]|print meddelelsesresum
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1641,7 +1697,7 @@ msgstr "brug kanonisk tekstmodus"
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
@@ -2589,12 +2645,12 @@ msgstr "       nye undern
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              u�ndrede: %lu\n"
@@ -2619,22 +2675,22 @@ msgstr "        nye signaturer: %lu\n"
 msgid "   new key revocations: %lu\n"
 msgstr "  nye n�gletilbagekald: %lu\n"
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " hemmelige n�gler l�st: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "hemmelige n�gler u�ndre: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "           importerede: %lu"
@@ -3761,13 +3817,13 @@ msgid ""
 msgstr ""
 
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "tilf�j n�gle"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "udl�b"
@@ -3824,7 +3880,7 @@ msgstr ""
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "ugyldig rustning"
@@ -4970,7 +5026,7 @@ msgstr ""
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 #, fuzzy
 msgid "unknown"
 msgstr "ukendt version"
@@ -5033,67 +5089,67 @@ msgstr "%s signatur fra: %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:737
+#: g10/misc.c:739
 #, fuzzy
 msgid "Uncompressed"
 msgstr "ikke bearbejdet"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "ikke bearbejdet"
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1047
+#: g10/misc.c:1049
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
@@ -5906,7 +5962,7 @@ msgstr "udelod: hemmelig n
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr ""
@@ -5951,7 +6007,7 @@ msgstr "fejl ved l
 msgid "read error in `%s': %s\n"
 msgstr "panser: %s\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
@@ -6094,165 +6150,165 @@ msgstr ""
 msgid "input line longer than %d characters\n"
 msgstr ""
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, fuzzy, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr ""
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 #, fuzzy
 msgid "[ revoked]"
 msgstr "tilf�j n�gle"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 #, fuzzy
 msgid "[ expired]"
 msgstr "udl�b"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ unknown]"
 msgstr "ukendt version"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "offentlig n�gle ikke fundet"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "|[NAMES]|tjek tillidsdatabasen"
 
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6299,25 +6355,25 @@ msgstr "kan ikke 
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr "s�t aflusningsflag"
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr "sl� fuld fejltjekning til"
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "Rapport�r venligst fejl til <gnupg-bugs@gnu.org>.\n"
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -6800,7 +6856,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "certifikatl�seproblem: %s\n"
@@ -7015,16 +7071,6 @@ msgstr "fjernelse af beskyttelse fejlede: %s\n"
 msgid "no valid recipients given\n"
 msgstr "ingen gyldige adresser\n"
 
-#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "fejl ved oprettelse af kodes�tning: %s\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "skriver til `%s'\n"
-
 #: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
@@ -7162,7 +7208,7 @@ msgstr "tilf
 msgid "add this secret keyring to the list"
 msgstr "tilf�j denne hemmeligen�glering til listen"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|brug NAME som standard hemmelign�gle"
 
@@ -7244,26 +7290,26 @@ msgstr "kan ikke 
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "Totalt antal behandlede: %lu\n"
 
-#: sm/import.c:226
+#: sm/import.c:227
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "Godt certifikat"
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
@@ -7477,28 +7523,28 @@ msgstr "fejl ved l
 msgid "error sending standard options: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "sl� fuld fejltjekning til"
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr ""
 
@@ -7514,57 +7560,83 @@ msgstr ""
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:521
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: tools/gpgconf-comp.c:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:533
+#, fuzzy
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|brug pasfrasemodus N"
+
+#: tools/gpgconf-comp.c:537
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "fejl ved oprettelse af kodes�tning: %s\n"
+
+#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|krypt�r for NAME"
 
-#: tools/gpgconf-comp.c:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|brug cifrealgoritme NAME for pasfrase"
 
-#: tools/gpgconf-comp.c:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8407,9 +8479,6 @@ msgstr "valgte cifferalgoritme %d er ugyldig\n"
 #~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 #~ msgstr "s�t alle pakker, cifre og resum� flag til OpenPGP standard"
 
-#~ msgid "|N|use passphrase mode N"
-#~ msgstr "|N|brug pasfrasemodus N"
-
 #~ msgid "|NAME|use message digest algorithm NAME for passphrases"
 #~ msgstr "|NAME|brug meddelelses resum�algoritme NAME for pasfrase"
 
diff --git a/po/de.po b/po/de.po
index f97a4c9fb..9a03e5daf 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-08-16 11:04+0200\n"
-"PO-Revision-Date: 2007-08-16 09:53+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\n"
+"PO-Revision-Date: 2007-08-28 19:41+0200\n"
 "Last-Translator: Walter Koch <koch@u32.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgstr ""
 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:436
+#: agent/call-pinentry.c:438
 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:439
+#: agent/call-pinentry.c:441
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -39,36 +39,36 @@ msgstr ""
 "Bitte geben Sie Ihre Passphrase ein, so daß der geheime Schlüssel benutzt "
 "werden kann"
 
-#: agent/call-pinentry.c:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (Versuch %d von %d)"
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 msgid "PIN too long"
 msgstr "Die PIN ist zu lang"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 msgid "Passphrase too long"
 msgstr "Das Mantra (Passphrase) ist zu lang"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 msgid "Invalid characters in PIN"
 msgstr "Ungültige Zeichen in der PIN"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr "Die PIN ist zu kurz"
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 msgid "Bad PIN"
 msgstr "Falsche PIN"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 msgid "Bad Passphrase"
 msgstr "Falsche Passphrase"
 
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 msgid "Passphrase"
 msgstr "Passphrase"
 
@@ -162,7 +162,26 @@ msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Bitte geben Sie die PIN%s%s%s ein um die Karte zu entsperren"
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "Fehler beim Erstellen einer temporären Datei: %s\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "Fehler beim Schreiben auf eine temporäre Datei: %s\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+msgid "Enter new passphrase"
+msgstr "Neue Passphrase eingeben"
+
+#: agent/genkey.c:165
+msgid "Take this one anyway"
+msgstr "Diese trotzdem benutzen"
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -177,15 +196,31 @@ msgstr[1] ""
 "WARNUNG:  Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben.  "
 "Eine Passphrase sollte%%0A mindestens %u Zeichen lang sein."
 
-#: agent/genkey.c:98
-msgid "Take this one anyway"
-msgstr "Diese trotzdem benutzen"
+#: agent/genkey.c:202
+#, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] "WARNUNG:  Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben.  Eine Passphrase sollte%%0Amindestens %u Sonderzeichen oder eine Ziffer enthalten."
+msgstr[1] "WARNUNG:  Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben.  Eine Passphrase sollte%%0A mindestens %u Sonderzeichen oder Ziffern enthalten."
 
-#: agent/genkey.c:99 agent/genkey.c:114
-msgid "Enter new passphrase"
-msgstr "Neue Passphrase eingeben"
+#: agent/genkey.c:225
+#, 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."
 
-#: agent/genkey.c:107
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr "Sie haben keine Passphrase eingegeben!%0AEine leere Passphrase ist nicht erlaubt."
+
+#: agent/genkey.c:240
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -195,29 +230,29 @@ msgstr ""
 "bestätigen Sie, daß sie auf jeden Schutz Ihres privaten Schlüssels\n"
 "verzichten."
 
-#: agent/genkey.c:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr "Ja, ein Schutz ist nicht notwendig"
 
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, 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:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: 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:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: 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:280
+#: agent/genkey.c:412
 msgid "Please enter the new passphrase"
 msgstr "Bitte geben Sie die Passphrase ein:"
 
-#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 msgid ""
 "@Options:\n"
@@ -226,109 +261,109 @@ msgstr ""
 "@Optionen:\n"
 " "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr "Im Server Modus ausführen"
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr "Im Daemon Modus ausführen"
 
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr "Ausgabe für /bin/sh"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr "Ausgabe für /bin/csh"
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr "Im Vordergrund laufen lassen"
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr "Tastatur und Maus nicht \"grabben\""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "Logausgaben in eine Datei umlenken"
 
-#: agent/gpg-agent.c:129
+#: agent/gpg-agent.c:135
 msgid "use a standard location for the socket"
 msgstr "Benutze einen Standardnamen für den Socket"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|benutze PGM as PIN-Entry"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|benutze PGM as SCdaemon"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 msgid "do not use the SCdaemon"
 msgstr "Den Scdaemon-basierten Kartenzugriff nicht nutzen"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr "Ignoriere Anfragen, das TTY zu wechseln"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr "Ignoriere Anfragen, das X-Display zu wechseln"
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|lasse PINs im Cache nach N Sekunden verfallen"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr "benutze PINs im Cache nicht bem Signieren"
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "erlaube Aufrufern Schlüssel als \"vertrauenswürdig\" zu markieren"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:172
 msgid "allow presetting passphrase"
 msgstr "erlaube ein \"preset\" von Passphrases"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr "Die ssh-agent-Emulation anschalten"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|DATEI|Schreibe die Umgebungsvariabeln auf DATEI"
 
-#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 tools/symcryptrun.c:204
 msgid "Please report bugs to <"
 msgstr "Fehlerberichte bitte an <"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:276
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Aufruf: gpg-agent [Optionen] (-h für Hilfe)"
 
-#: agent/gpg-agent.c:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -336,129 +371,129 @@ msgstr ""
 "Syntax: gpg-agent [Optionen] [Befehl [Argumente]]\n"
 "Verwaltung von geheimen Schlüsseln für GnuPG\n"
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ungültige Debugebene `%s' angegeben\n"
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, 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:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "Verzeichnis `%s' kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr "Der Name des Sockets ist zu lang\n"
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "Socket kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 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:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, 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:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "Der listen()-Aufruf ist fehlgeschlagen: %s\n"
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "Es wird auf Socket `%s' gehört\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "Verzeichnis `%s' erzeugt\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat()-Aufruf für `%s' fehlgeschlagen: %s\n"
 
-#: agent/gpg-agent.c:1381
+#: agent/gpg-agent.c:1438
 #, 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:1492
+#: agent/gpg-agent.c:1549
 #, 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:1497
+#: agent/gpg-agent.c:1554
 #, 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:1514
+#: agent/gpg-agent.c:1571
 #, 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:1519
+#: agent/gpg-agent.c:1576
 #, 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:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
 
-#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s angehalten\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 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:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
 
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -488,16 +523,16 @@ msgstr ""
 "Syntax: gpg-protect-tool [Optionen] [Argumente]\n"
 "Werkzeug zum Bearbeiten von geheimen Schlüsseln\n"
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 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:1190
+#: agent/protect-tool.c:1213
 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:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -505,7 +540,7 @@ msgstr ""
 "Bitte geben Sie die Passphrase ein, um das importierte Objekt im GnuPG "
 "System zu schützen."
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -513,16 +548,16 @@ msgstr ""
 "Die Eingabe der Passphrase bzw. der PIN\n"
 "wird benötigt um diese Aktion auszuführen."
 
-#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "Fehler bei der Abfrage der Passphrase: %s\n"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 msgid "cancelled\n"
 msgstr "Vom Benutzer abgebrochen\n"
 
@@ -576,8 +611,8 @@ msgstr "Fehler beim Lesen der Liste vertrauenswürdiger root-Zertifikate\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -589,7 +624,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr "Korrekt"
 
@@ -601,7 +636,7 @@ msgstr "Korrekt"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -610,50 +645,72 @@ msgstr ""
 "Wenn Sie vollständiges Vertrauen haben, daß%%0A  \"%s\"%%"
 "0ABenutzerzertifikate verläßlich zertifiziert, so antworten Sie mit \"Ja\""
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr "Nein"
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr "Hinweis: Diese Passphrase wurde noch nie geändert/%0ABitte ändern Sie sie jetzt."
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+"Diese Passphrase wurde seit dem %.4s-%.2s-%.2s nicht%%0A\n"
+"mehr geändert.  Bitte ändern Sie sie jetzt."
+
+#: agent/findkey.c:188 agent/findkey.c:195
+msgid "Change passphrase"
+msgstr "Die Passphrase ändern"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr "Ich werde sie später ändern"
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "Fehler beim Erzeugen einer \"Pipe\": %s\n"
 
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "Pipe kann nicht zum Lesen \"fdopen\"t werden: %s\n"
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "Fehler beim \"Forken\" des Prozess: %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "Das Warten auf die Beendigung des Prozesses %d schlug fehl: %s\n"
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "Fehler beim Holen des Exitwerte des Prozesses %d: %s\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "Fehler bei Ausführung von `%s': Endestatus %d\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr "Feler bei Ausführung von `%s': wahrscheinlich nicht installiert\n"
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "Fehler bei Ausführung von `%s': beendet\n"
@@ -692,17 +749,17 @@ msgstr "Vom Benutzer abgebrochen\n"
 msgid "problem with the agent\n"
 msgstr "Problem mit dem Agenten\n"
 
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "core-dump-Dateierzeugung kann nicht abgeschaltet werden: %s\n"
 
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "WARNUNG: Unsichere Besitzrechte für %s \"%s\"\n"
 
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte für %s \"%s\"\n"
@@ -1467,7 +1524,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:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1599,7 +1656,7 @@ msgstr "|algo [Dateien]|Message-Digests für die Dateien ausgeben"
 msgid "run in server mode"
 msgstr "Im Server Modus ausführen"
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1634,7 +1691,7 @@ msgstr "Textmodus benutzen"
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "Keine wirklichen Änderungen durchführen"
 
@@ -2702,12 +2759,12 @@ msgstr "              ignorierte neue Schlüssel: %lu\n"
 msgid "          w/o user IDs: %lu\n"
 msgstr "                           ohne User-ID: %lu\n"
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "                             importiert: %lu"
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                            unverändert: %lu\n"
@@ -2732,22 +2789,22 @@ msgstr "                        neue Signaturen: %lu\n"
 msgid "   new key revocations: %lu\n"
 msgstr "                neue Schlüsselwiderrufe: %lu\n"
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "             gelesene geheime Schlüssel: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "           geheime Schlüssel importiert: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "                 unveränderte geh.Schl.: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                       nicht importiert: %lu\n"
@@ -3891,12 +3948,12 @@ msgstr ""
 "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
 
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "widerrufen"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "verfallen"
 
@@ -3957,7 +4014,7 @@ msgstr "%d Beglaubigungen entfernt.\n"
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "ungültig"
 
@@ -5125,7 +5182,7 @@ msgstr "Binäre"
 msgid "textmode"
 msgstr "Textmodus"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 msgid "unknown"
 msgstr "unbekannt"
 
@@ -5187,66 +5244,66 @@ msgstr "WARNUNG: Verwendung des experimentellen Hashverfahrens %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "WARNUNG: Die Verwendung des Hashverfahrens %s ist nicht ratsam\n"
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "das IDEA-Verschlüsselungs-Plugin ist nicht vorhanden\n"
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "Siehe %s für weitere Infos\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: mißbilligte Option \"%s\".\n"
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNUNG: \"%s\" ist eine mißbilligte Option.\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Bitte benutzen Sie stattdessen \"%s%s\".\n"
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "WARNUNG: \"%s\" ist ein nicht ratsamer Befehl - verwenden Sie ihn nicht.\n"
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: Die Option \"%s\" is veraltet - sie hat keine Wirkung\n"
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "WARNUNG: \"%s\" ist eine veraltete Option - sie hat keine Wirkung.\n"
 
-#: g10/misc.c:737
+#: g10/misc.c:739
 msgid "Uncompressed"
 msgstr "nicht komprimiert"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 msgid "uncompressed|none"
 msgstr "unkomprimiert|kein|keine"
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, 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:1047
+#: g10/misc.c:1049
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "Mehrdeutige Option '%s'\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "Unbekannte Option '%s'\n"
@@ -6117,7 +6174,7 @@ msgstr ""
 "Dies ist ein durch PGP erzeugter Elgamal-Schlüssel. Das ist für Signaturen "
 "NICHT sicher genug!"
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "Vertrauenssatz %lu, Typ %d: Schreiben fehlgeschlagen: %s\n"
@@ -6162,7 +6219,7 @@ msgstr "Fehler beim Suchen des \"Trust records\" in `%s': %s\n"
 msgid "read error in `%s': %s\n"
 msgstr "Lesefehler in `%s': %s\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
@@ -6307,161 +6364,161 @@ msgstr "Textzeilen länger als %d Zeichen können nicht benutzt werden\n"
 msgid "input line longer than %d characters\n"
 msgstr "Eingabezeile ist länger als %d Zeichen\n"
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' ist keine gültige lange Schlüssel-ID\n"
 
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "Schlüssel %s: Als vertrauenswürdiger Schlüssel akzeptiert\n"
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "Schlüssel %s tritt mehr als einmal in der \"trustdb\" auf\n"
 
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "Schlüssel %s: kein öffentlicher Schlüssel für den vertrauenswürdigen "
 "Schlüssel - übersprungen\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "Schlüssel %s ist als uneingeschränkt vertrauenswürdig gekennzeichnet\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req type %d: read failed: %s\n"
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "Vertrauenssatz %lu ist nicht von der angeforderten Art %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "kann unbekanntes Vertrauensmodell nicht verwenden (%d) - verwende "
 "Vertrauensmodell %s\n"
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr "verwende Vertrauensmodell %s\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "10"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 msgid "[ revoked]"
 msgstr "[widerrufen]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 msgid "[ expired]"
 msgstr "[verfall.]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 msgid "[ unknown]"
 msgstr "[  unbek.]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr "[  undef.]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr "[marginal]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr "[ vollst.]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr "[ uneing.]"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr "unbestimmt"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 msgid "never"
 msgstr "niemals"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr "marginal"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr "vollständig"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr "uneingeschränkt"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr "\"Trust-DB\"-Überprüfung nicht nötig\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nächste \"Trust-DB\"-Pflichtüberprüfung am %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "\"Trust-DB\"-Überprüfung ist beim `%s'-Vertrauensmodell nicht nötig\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "\"Trust-DB\"-Änderung ist beim `%s'-Vertrauensmodell nicht nötig\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "Öffentlicher Schlüssel %s nicht gefunden: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr "Bitte ein --check-trustdb durchführen\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 msgid "checking the trustdb\n"
 msgstr "\"Trust-DB\" wird überprüft\n"
 
 # translated by wk
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d Schlüssel verarbeitet (%d Validity Zähler gelöscht)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 msgid "no ultimately trusted keys found\n"
 msgstr "keine uneingeschränkt vertrauenswürdige Schlüssel gefunden\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "öff.Schlüssel des uneingeschränkt vertrautem Schlüssel %s nicht gefunden\n"
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d marginal-needed, %d complete-needed, %s Vertrauensmodell\n"
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6469,7 +6526,7 @@ msgstr ""
 "Tiefe: %d  gültig: %3d  unterschrieben: %3d  Vertrauen: %d-, %dq, %dn, %dm, %"
 "df, %du\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6521,23 +6578,23 @@ msgstr "iconv_open fehlgeschlagen: %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "Umwandlung von `%s' in `%s' schlug fehl: %s\n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr "Debug Flags setzen"
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr "Alle Debug Flags setzen"
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 msgid "Please report bugs to "
 msgstr "Bitte richten sie Berichte über Bugs (Softwarefehler) an "
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Aufruf: kbxutil [Optionen] [Dateien] (-h für Hilfe)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -7013,7 +7070,7 @@ msgstr "Das Wurzelzertifikat ist nicht als vertrauenswürdig markiert"
 msgid "checking the trust list failed: %s\n"
 msgstr "Fehler beim Prüfen der vertrauenswürdigen Zertifikate: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr "Der Zertifikatkette ist zu lang\n"
 
@@ -7227,16 +7284,6 @@ 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/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "Fehler beim Erstellen einer temporären Datei: %s\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "Fehler beim Schreiben auf eine temporäre Datei: %s\n"
-
 #: sm/gpgsm.c:244
 msgid "|[FILE]|make a signature"
 msgstr "|[DATEI]|Erzeuge eine Signatur"
@@ -7367,7 +7414,7 @@ msgstr "Als öffentlichen Schlüsselbund mitbenutzen"
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schlüsselbund mitbenutzen"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen"
 
@@ -7444,25 +7491,25 @@ msgstr "Signieren mit `%s' nicht möglich: %s\n"
 msgid "this command has not yet been implemented\n"
 msgstr "Dieser Befehl wurde noch nicht implementiert\n"
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, c-format
 msgid "total number processed: %lu\n"
 msgstr "gesamte verarbeitete Anzahl: %lu\n"
 
-#: sm/import.c:226
+#: sm/import.c:227
 msgid "error storing certificate\n"
 msgstr "Fehler beim speichern des Zertifikats\n"
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr "Grundlegende Zertifikatprüfungen fehlgeschlagen - nicht importiert\n"
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "Fehler beim Importieren des Zertifikats: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "Fehler beim Lesen der Eingabe: %s\n"
@@ -7681,27 +7728,27 @@ msgstr "Fehler beim Senden des %s-Befehls: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "Fehler beim Senden der Standardoptionen: %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr "Optionen zur Einstellung Diagnoseausgaben"
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr "Optionen zur Einstellung der Konfiguration"
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 msgid "Options useful for debugging"
 msgstr "Nützliche Optionen zum Debuggen"
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr "Optionen zur Einstellung der Sicherheit"
 
@@ -7717,55 +7764,79 @@ msgstr "|N|setze die maximale Lebensdauer von PINs im Cache auf N Sekunden"
 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:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr "Optionen für eien Passphrase-Policy"
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr "Einhaltung der Passphrase-Policy erzwingen"
+
+#: tools/gpgconf-comp.c:521
 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:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+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:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr "|DATEI|Prüfe neue Passphrases gegen die Regelen in DATEI"
+
+#: tools/gpgconf-comp.c:533
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|Lasse die Passphrase nach N Tagen verfallen"
+
+#: tools/gpgconf-comp.c:537
+msgid "do not allow the reuse of old passphrases"
+msgstr "Verbiete die Wiedernutzung alter Passphrases."
+
+#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|Auf an NAME verschlüsseln"
 
-#: tools/gpgconf-comp.c:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr "Konfiguration der Schlüsselserver"
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr "Erlaube PKA Zugriffe (DNS Anfragen)"
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|Benutze die Kodierung NAME für PKCS#12 Passphrasen"
 
-#: tools/gpgconf-comp.c:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr "CRL bei Wurzelzertifikaten nicht überprüfen"
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr "Optionen zum Einstellen der Ausgabeformate"
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr "Optionen zur Einstellung der Interaktivität und Geltendmachung"
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr "Konfiguration für HTTP Server"
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr "Einstellungen des System HTTP-Proxy benutzen"
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr "Konfiguration der zu nutzenden LDAP-Server"
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr "Konfiguration zu OCSP"
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr "Beachten Sie, daß Gruppenspezifiaktionen ignoriert werden\n"
 
diff --git a/po/el.po b/po/el.po
index a81decf85..44bb564b1 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-08-16 11:04+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\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"
@@ -19,54 +19,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: agent/call-pinentry.c:436
+#: agent/call-pinentry.c:438
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:439
+#: agent/call-pinentry.c:441
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/call-pinentry.c:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 #, fuzzy
 msgid "PIN too long"
 msgstr "� ������ ����� ���� ������\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "� ����� ������ ����� ���� ������\n"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "�� ������� ���������� ��� �����\n"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Bad PIN"
 msgstr "���� MPI"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "���� ����� ������"
 
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 #, fuzzy
 msgid "Passphrase"
 msgstr "���� ����� ������"
@@ -161,7 +161,28 @@ msgstr "
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "������� ���  `%s'\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "�������������� �� ����� ������\n"
+
+#: agent/genkey.c:165
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "����� ���������� ����� ��� ��������; "
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -172,50 +193,64 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:98
-#, fuzzy
-msgid "Take this one anyway"
-msgstr "����� ���������� ����� ��� ��������; "
+#: agent/genkey.c:202
+#, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] ""
+msgstr[1] ""
 
-#: agent/genkey.c:99 agent/genkey.c:114
-#, fuzzy
-msgid "Enter new passphrase"
-msgstr "�������������� �� ����� ������\n"
+#: agent/genkey.c:225
+#, 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 ""
 
-#: agent/genkey.c:107
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+
+#: agent/genkey.c:240
 #, 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:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
 "\n"
 
-#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "������ ��� ������ ������"
 
-#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: 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:280
+#: agent/genkey.c:412
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "������ ��� ������ ������"
 
-#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
@@ -226,247 +261,247 @@ msgstr ""
 "��������:\n"
 " "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "���������"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "����� ������"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|������|������� ��� ���������� ��������� ������"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "��������� �������� �� ��� ���������� ��������"
 
-#: agent/gpg-agent.c:129
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "�������� ��� ����� ��������� ������������"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:172
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "��������� �� ���������� ��� <gnupg-bugs@gnu.org>\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:276
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: agent/gpg-agent.c:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�������� ����������� ��������� `%s': %s\n"
 
-#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "������ ��� �������� ���� �� `%s': %s\n"
 
-#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: ��������� �������������\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1381
+#: agent/gpg-agent.c:1438
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: �������� ����������� ���������: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1549
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1554
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1571
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1519
+#: agent/gpg-agent.c:1576
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ������������: %s\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "��������������� ��������� ������������� GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -494,40 +529,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/protect-tool.c:1190
+#: agent/protect-tool.c:1213
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "���� ����� ������"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "�������"
@@ -579,8 +614,8 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -590,7 +625,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr ""
 
@@ -602,58 +637,79 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 #, fuzzy
 msgid "Yes"
 msgstr "���|���"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr ""
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+
+#: agent/findkey.c:188 agent/findkey.c:195
+#, fuzzy
+msgid "Change passphrase"
+msgstr "������ ��� ������ ������"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr ""
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "�������� ��������� ��� �������: %s\n"
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@ -696,17 +752,17 @@ msgstr "
 msgid "problem with the agent\n"
 msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
 
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "�������� ��������������� ��� core dump: %s\n"
 
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
@@ -1504,7 +1560,7 @@ msgstr "
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1637,7 +1693,7 @@ msgstr "|
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1672,7 +1728,7 @@ msgstr "
 msgid "use as output file"
 msgstr "����� �� ������� ������"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "�� �� ����� ������ ������"
 
@@ -2718,12 +2774,12 @@ msgstr "      
 msgid "          w/o user IDs: %lu\n"
 msgstr "          ����� user ID: %lu\n"
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "              ����������: %lu"
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             ����������: %lu\n"
@@ -2748,22 +2804,22 @@ msgstr "        
 msgid "   new key revocations: %lu\n"
 msgstr "   ���� ���������� ��������: %lu\n"
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      ����������� ������� �������: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  ���������� ������� �������: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " ���������� ������� �������: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          ��  ����������: %lu\n"
@@ -3946,13 +4002,13 @@ msgstr ""
 "����� ��� ��� �������������� �� ���������.\n"
 
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[����������]"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4012,7 +4068,7 @@ msgstr "
 msgid "Nothing deleted.\n"
 msgstr "������ ��� �����������.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "�� ������ ��������"
@@ -5202,7 +5258,7 @@ msgstr "
 msgid "textmode"
 msgstr "���������-��������"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 msgid "unknown"
 msgstr "�������"
 
@@ -5266,66 +5322,66 @@ msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "�� ����� ��� ��������������� IDEA ��� �������\n"
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = ���������� ������������ �����������\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: �� ������������ ������� \"%s\"\n"
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "�������� �������������� �� \"%s%s\" ��������\n"
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:737
+#: g10/misc.c:739
 msgid "Uncompressed"
 msgstr "����������"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "����������"
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "���� �� ������ ���� ��� ������ �� �������������� ��� %s\n"
 
-#: g10/misc.c:1047
+#: g10/misc.c:1049
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
@@ -6187,7 +6243,7 @@ msgstr ""
 "������������ `%s': ���� ����� ������������� ��� PGP ������ ElGamal ��� ��� "
 "����� ������� ��� ���������!\n"
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "������� trust %lu, ����� %d: write �������: %s\n"
@@ -6235,7 +6291,7 @@ msgstr "
 msgid "read error in `%s': %s\n"
 msgstr "������ ���������: %s\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync �������: %s\n"
@@ -6378,168 +6434,168 @@ msgstr "
 msgid "input line longer than %d characters\n"
 msgstr "������ ������� ���������� ��� %d ����������\n"
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' ��� ����� ������ ����� keyID\n"
 
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "������ %08lX: ������� ��� ������ �� �����������\n"
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "�� ������ %08lX ������� ���� ��� ��� ���� ���� trustdb\n"
 
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "������ %08lX: ������ ������� ������ ��� �� ������ �� ����������� - "
 "���������\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "�������� �������� ��� �������� ������������.\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "������� trust %lu, req ����� %d: read �������: %s\n"
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "� ������� trust %lu ��� ����� ��� ���������� ����� %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[����������]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 #, fuzzy
 msgid "[ expired]"
 msgstr "[�������]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ unknown]"
 msgstr "�������"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 #, fuzzy
 msgid "never"
 msgstr "����     "
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "�������� ������� ��� trustdb �� ����� ���� %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "�� ������� ������ %08lX ��� �������: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr "�������� ����� ��� --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 msgid "checking the trustdb\n"
 msgstr "������� ��� trustdb\n"
 
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d ������� �������������� (%d ��������� ����������� �������)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 msgid "no ultimately trusted keys found\n"
 msgstr "�� �������� ������� ������������ �������\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "�� ������� �� ������� ������ ��� ������� ������������� �������� %08lX\n"
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "������� trust %lu, ����� %d: write �������: %s\n"
@@ -6589,25 +6645,25 @@ msgstr "
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "��������� �� ���������� ��� <gnupg-bugs@gnu.org>\n"
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -7088,7 +7144,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
@@ -7304,16 +7360,6 @@ msgstr "
 msgid "no valid recipients given\n"
 msgstr "(��� ������ ���������)\n"
 
-#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "������ ��� ���������� ��� ������ ������: %s\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "������� ���  `%s'\n"
-
 #: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
@@ -7451,7 +7497,7 @@ msgstr "
 msgid "add this secret keyring to the list"
 msgstr "�������� ����� ��� �������� ����������� ��� �����"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr "|�����|����� �������� ��� �������������� ������� ������"
 
@@ -7532,26 +7578,26 @@ msgstr "
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "��������� ������� ��� ��������������: %lu\n"
 
-#: sm/import.c:226
+#: sm/import.c:227
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "���������� ���� �������������� ���������"
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@ -7765,27 +7811,27 @@ msgstr "
 msgid "error sending standard options: %s\n"
 msgstr "������ ��� �������� ���� �� `%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr ""
 
@@ -7801,57 +7847,83 @@ msgstr ""
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:521
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: tools/gpgconf-comp.c:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:533
+#, fuzzy
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|����� ��� ���������� ������ ������ N"
+
+#: tools/gpgconf-comp.c:537
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+
+#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|�����|������������� ��� �����"
 
-#: tools/gpgconf-comp.c:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|�����|����� ���������� �������������� ����� ��� ������� �������"
 
-#: tools/gpgconf-comp.c:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8869,9 +8941,6 @@ msgstr "
 #~ "������� ���� ��� �������� ������,����������,�������� �� PGP 2.x "
 #~ "�����������"
 
-#~ msgid "|N|use passphrase mode N"
-#~ msgstr "|N|����� ��� ���������� ������ ������ N"
-
 #~ msgid "|NAME|use message digest algorithm NAME for passphrases"
 #~ msgstr ""
 #~ "|ONOMA|����� ��� ���������� ��������� ��������� ����� ��� ������� �������"
diff --git a/po/eo.po b/po/eo.po
index e62f28b83..8a80a5ab4 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-08-16 11:04+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\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"
@@ -19,54 +19,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: agent/call-pinentry.c:436
+#: agent/call-pinentry.c:438
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:439
+#: agent/call-pinentry.c:441
 #, 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:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 #, fuzzy
 msgid "PIN too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nevalida signo en nomo\n"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Bad PIN"
 msgstr "malbona MPI"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "malbona pasfrazo"
 
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 #, fuzzy
 msgid "Passphrase"
 msgstr "malbona pasfrazo"
@@ -162,7 +162,28 @@ msgstr "la pasfrazo ne estis 
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "eraro dum kreado de pasfrazo: %s\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "skribas al '%s'\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Donu pasfrazon\n"
+
+#: agent/genkey.c:165
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "�u tamen uzi �i tiun �losilon? "
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -173,50 +194,64 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:98
-#, fuzzy
-msgid "Take this one anyway"
-msgstr "�u tamen uzi �i tiun �losilon? "
+#: agent/genkey.c:202
+#, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] ""
+msgstr[1] ""
 
-#: agent/genkey.c:99 agent/genkey.c:114
-#, fuzzy
-msgid "Enter new passphrase"
-msgstr "Donu pasfrazon\n"
+#: agent/genkey.c:225
+#, 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 ""
 
-#: agent/genkey.c:107
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+
+#: agent/genkey.c:240
 #, 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:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, 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:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: 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:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: 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:280
+#: agent/genkey.c:412
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
@@ -227,246 +262,246 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detala eligo"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "ser�i �losilojn �e �losilservilo"
 
-#: agent/gpg-agent.c:129
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualigi la fido-datenaron"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:172
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Bonvolu raporti cimojn al <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:276
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: agent/gpg-agent.c:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 #, 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:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: dosierujo kreita\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1381
+#: agent/gpg-agent.c:1438
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1549
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1554
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1571
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1519
+#: agent/gpg-agent.c:1576
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu �losiloj ignoritaj\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 #, 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:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -494,40 +529,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 #, 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:1190
+#: agent/protect-tool.c:1213
 #, 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:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 #, 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:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "malbona pasfrazo"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "nuligita de uzanto\n"
@@ -579,8 +614,8 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -590,7 +625,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr ""
 
@@ -602,58 +637,79 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 #, fuzzy
 msgid "Yes"
 msgstr "jes"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr ""
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+
+#: agent/findkey.c:188 agent/findkey.c:195
+#, fuzzy
+msgid "Change passphrase"
+msgstr "�an�i la pasfrazon"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr ""
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -696,17 +752,17 @@ msgstr "nuligita de uzanto\n"
 msgid "problem with the agent\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
 
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ne povas mal�alti kreadon de core-dosieroj: %s\n"
 
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
@@ -1488,7 +1544,7 @@ msgstr "uzas flankan 
 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:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1621,7 +1677,7 @@ msgstr "|metodo [dosieroj]|presi mesa
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1656,7 +1712,7 @@ msgstr "uzi tekstan re
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
@@ -2688,12 +2744,12 @@ msgstr "    ignoritaj novaj 
 msgid "          w/o user IDs: %lu\n"
 msgstr "         sen uzantidentigilo: %lu\n"
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  ne�an�itaj: %lu\n"
@@ -2718,22 +2774,22 @@ msgstr "            novaj subskriboj: %lu\n"
 msgid "   new key revocations: %lu\n"
 msgstr "         novaj �losilrevokoj: %lu\n"
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   sekretaj �losiloj legitaj: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "sekretaj �losiloj importitaj: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "sekretaj �losiloj ne�an�itaj: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "                  importitaj: %lu"
@@ -3917,13 +3973,13 @@ msgid ""
 msgstr ""
 
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
@@ -3982,7 +4038,7 @@ msgstr "Forvi
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "nevalida"
 
@@ -5168,7 +5224,7 @@ msgstr "
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 #, fuzzy
 msgid "unknown"
 msgstr "nekonata versio"
@@ -5230,67 +5286,67 @@ msgstr "%s-subskribo de: %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "la aldona�o por la �ifro IDEA en �eestas\n"
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = bonvolu montri pli da informoj\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:737
+#: g10/misc.c:739
 #, fuzzy
 msgid "Uncompressed"
 msgstr "ne traktita"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "ne traktita"
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, 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:1047
+#: g10/misc.c:1049
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
@@ -6129,7 +6185,7 @@ msgstr ""
 "ignoris '%s': �i tio estas PGP-kreita ElGamal-�losilo, kiu ne estas sekura "
 "por subskribado!\n"
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
@@ -6175,7 +6231,7 @@ msgstr "eraro dum legado de dosieruja registro: %s\n"
 msgid "read error in `%s': %s\n"
 msgstr "kiraso: %s\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "fido-datenaro: sync malsukcesis: %s\n"
@@ -6318,165 +6374,165 @@ msgstr "ne povas trakti tekstliniojn pli longajn ol %d signojn\n"
 msgid "input line longer than %d characters\n"
 msgstr "enigata linio pli longa ol %d signojn\n"
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' ne estas valida longa �losilidentigilo\n"
 
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "�losilo %08lX: akceptita kiel fidata �losilo\n"
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "�losilo %08lX aperas pli ol unufoje en la fido-datenaro\n"
 
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "�losilo %08lX: mankas publika �losilo por fidata �losilo - ignorita\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "�losilo markita kiel absolute fidata.\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "fido-datenaro loko %lu, petospeco %d: lego malsukcesis: %s\n"
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "fido-registro %lu ne havas petitan specon %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 #, fuzzy
 msgid "[ revoked]"
 msgstr "rev"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 #, fuzzy
 msgid "[ expired]"
 msgstr "eksval"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ unknown]"
 msgstr "nekonata versio"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sekva kontrolo de fido-datenaro je %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "publika �losilo %08lX ne trovita: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 msgid "checking the trustdb\n"
 msgstr "kontrolas la fido-datenaron\n"
 
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
@@ -6526,25 +6582,25 @@ msgstr "ne povas malfermi %s: %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "Bonvolu raporti cimojn al <gnupg-bugs@gnu.org>.\n"
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -7033,7 +7089,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Valida atestilrevoko"
@@ -7252,16 +7308,6 @@ msgstr "forvi
 msgid "no valid recipients given\n"
 msgstr "nevalida respondo de agento\n"
 
-#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "eraro dum kreado de pasfrazo: %s\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "skribas al '%s'\n"
-
 #: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
@@ -7399,7 +7445,7 @@ msgstr "aldoni 
 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:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
 
@@ -7480,26 +7526,26 @@ msgstr "ne povas fermi '%s': %s\n"
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "      Nombro traktita entute: %lu\n"
 
-#: sm/import.c:226
+#: sm/import.c:227
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "Bona atestilo"
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -7711,27 +7757,27 @@ msgstr "eraro dum sendo al '%s': %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr ""
 
@@ -7747,57 +7793,83 @@ msgstr ""
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:521
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: tools/gpgconf-comp.c:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:533
+#, fuzzy
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|uzi pasfraz-re�imon N"
+
+#: tools/gpgconf-comp.c:537
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "eraro dum kreado de pasfrazo: %s\n"
+
+#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: tools/gpgconf-comp.c:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO por pasfrazoj"
 
-#: tools/gpgconf-comp.c:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8772,9 +8844,6 @@ msgstr "protekto-metodo %d%s ne estas realigita\n"
 #~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 #~ msgstr "�alti �iujn paket-, �ifrad- kaj kompendi-opciojn al PGP-2.x-konduto"
 
-#~ msgid "|N|use passphrase mode N"
-#~ msgstr "|N|uzi pasfraz-re�imon N"
-
 #~ msgid "|NAME|use message digest algorithm NAME for passphrases"
 #~ msgstr "|NOMO|uzi kompendi-metodon NOMO por pasfrazoj"
 
diff --git a/po/es.po b/po/es.po
index aef9c1b09..8cc571ffe 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-08-16 11:04+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\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"
@@ -23,44 +23,44 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "fallo al almacenar la huella digital: %s\n"
 
-#: agent/call-pinentry.c:436
+#: agent/call-pinentry.c:438
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:439
+#: agent/call-pinentry.c:441
 #, 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:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 #, fuzzy
 msgid "PIN too long"
 msgstr "l�nea demasiado larga"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "frase contrase�a demasiado larga\n"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter inv�lido en el nombre\n"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorrecto"
@@ -74,7 +74,7 @@ msgstr "MPI incorrecto"
 # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
 # �Es que son m�s listos? :-)
 #
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "Frase contrase�a incorrecta"
@@ -88,7 +88,7 @@ msgstr "Frase contrase
 # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
 # �Es que son m�s listos? :-)
 #
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 #, fuzzy
 msgid "Passphrase"
 msgstr "Frase contrase�a incorrecta"
@@ -183,7 +183,28 @@ msgstr "PIN repetido incorrectamente; int
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "PIN [firmas hechas: %lu]"
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "error creando frase contrase�a: %s\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "error escribiendo anillo `%s': %s\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Introduzca frase contrase�a\n"
+
+#: agent/genkey.c:165
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "�Usar esta clave de todas formas? (s/N) "
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -194,50 +215,64 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:98
-#, fuzzy
-msgid "Take this one anyway"
-msgstr "�Usar esta clave de todas formas? (s/N) "
+#: agent/genkey.c:202
+#, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] ""
+msgstr[1] ""
 
-#: agent/genkey.c:99 agent/genkey.c:114
-#, fuzzy
-msgid "Enter new passphrase"
-msgstr "Introduzca frase contrase�a\n"
+#: agent/genkey.c:225
+#, 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 ""
 
-#: agent/genkey.c:107
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+
+#: agent/genkey.c:240
 #, 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:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, 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:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: 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:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: 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:280
+#: agent/genkey.c:412
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
@@ -248,247 +283,247 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "prolijo"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: 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:129
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "establecer preferencias para todos los ID seleccionados"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualiza la base de datos de confianza"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:172
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 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:260
+#: agent/gpg-agent.c:276
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: agent/gpg-agent.c:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, 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:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no se puede crear el directorio `%s': %s\n"
 
-#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 #, 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:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "error enviando a `%s': %s\n"
 
-#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "directorio `%s' creado\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) fall� en %s: %s\n"
 
-#: agent/gpg-agent.c:1381
+#: agent/gpg-agent.c:1438
 #, 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:1492
+#: agent/gpg-agent.c:1549
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1554
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1571
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1519
+#: agent/gpg-agent.c:1576
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, 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:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu claves omitidas\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 #, 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:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
 
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -516,23 +551,23 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 #, 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:1190
+#: agent/protect-tool.c:1213
 #, 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:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
@@ -548,17 +583,17 @@ msgstr "Por favor introduzca la contrase
 # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
 # �Es que son m�s listos? :-)
 #
-#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "Frase contrase�a incorrecta"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "cancelado"
@@ -610,8 +645,8 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -621,7 +656,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr ""
 
@@ -633,58 +668,79 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 #, fuzzy
 msgid "Yes"
 msgstr "s�"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr ""
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+
+#: agent/findkey.c:188 agent/findkey.c:195
+#, fuzzy
+msgid "Change passphrase"
+msgstr "cambia la frase contrase�a"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr ""
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "no puede abrirse el fichero: %s\n"
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "error obteniendo la informaci�n actual de la clave: %s\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "error leyendo `%s': %s\n"
@@ -727,17 +783,17 @@ msgstr "cancelado por el usuario\n"
 msgid "problem with the agent\n"
 msgstr "problema con el agente: el agente devuelve 0x%lx\n"
 
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no se pueden desactivar los volcados de core: %s\n"
 
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "AVISO: propiedad insegura de la extensi�n `%s'\n"
 
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVISO: permisos inseguros de la extensi�n `%s'\n"
@@ -1497,7 +1553,7 @@ msgstr "clave %s: clave secreta sin clave p
 # 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:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1629,7 +1685,7 @@ msgstr "|algo [ficheros]|imprime res
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1664,7 +1720,7 @@ msgstr "usa modo de texto can
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
@@ -2709,12 +2765,12 @@ msgstr "      omitidas nuevas claves: %lu\n"
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sin identificador: %lu\n"
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importadas: %lu"
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             sin cambios: %lu\n"
@@ -2739,22 +2795,22 @@ msgstr "              nuevas firmas: %lu\n"
 msgid "   new key revocations: %lu\n"
 msgstr "        nuevas revocaciones de claves: %lu\n"
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     claves secretas le�das: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " claves secretas importadas: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claves secretas sin cambios: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          no importadas: %lu\n"
@@ -3871,12 +3927,12 @@ msgstr ""
 "correcta a menos de que reinicie el programa.\n"
 
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "revocada"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "caducada"
 
@@ -3935,7 +3991,7 @@ msgstr "%d firmas borradas\n"
 msgid "Nothing deleted.\n"
 msgstr "No se borr� nada\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "Armadura no v�lida"
@@ -5092,7 +5148,7 @@ msgstr "binaria"
 msgid "textmode"
 msgstr "modotexto"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 msgid "unknown"
 msgstr "desconocido"
 
@@ -5153,65 +5209,65 @@ msgstr "AVISO: usando algoritmo de resumen experimental %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVISO: el algoritmo de resumen %s es una opci�n desaconsejada\n"
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "el plugin para el cifrado IDEA no est� presente\n"
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = por favor mu�streme m�s informaci�n\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opci�n desaconsejada \"%s\"\n"
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATENCI�N: \"%s\" es una opci�n desaconsejada\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor use \"%s%s\" en su lugar\n"
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ATENCI�N: \"%s\" es una opci�n desaconsejada\n"
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "ATENCI�N: \"%s\" es una opci�n desaconsejada\n"
 
-#: g10/misc.c:737
+#: g10/misc.c:739
 msgid "Uncompressed"
 msgstr "Sin comprimir"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 msgid "uncompressed|none"
 msgstr "sin_comprimir|ninguno"
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, 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:1047
+#: g10/misc.c:1049
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "opci�n ambigua `%s'\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "opci�n desconocida `%s'\n"
@@ -6043,7 +6099,7 @@ msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "�esta es una clave ElGamal generada por PGP que NO es segura para firmar!"
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registro de confianza %lu, tipo %d: fallo escritura: %s\n"
@@ -6088,7 +6144,7 @@ msgstr "error econtrando registro de confianza en `%s': %s\n"
 msgid "read error in `%s': %s\n"
 msgstr "error de lectura `%s': %s\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallo sincronizaci�n: %s\n"
@@ -6234,161 +6290,161 @@ msgstr "no se pueden manejar l
 msgid "input line longer than %d characters\n"
 msgstr "l�nea de longitud superior a %d caracteres\n"
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' no es un identificador largo de clave v�lido\n"
 
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "clave %s: aceptada como clave fiable\n"
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "la clave %s aparece m�s de una vez en la base de datos de confianza\n"
 
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "clave %s: clave fiable sin clave p�blica - omitida\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "clave %s marcada como de confianza absoluta\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registro de confianza %lu, petici�n tipo %d: fallo lectura: %s\n"
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "registro de confianza %lu no es del tipo requerido %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "imposible usar modelo de confianza (%d) - asumiendo el modelo %s\n"
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr "usando %s como modelo de confianza\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "13 no apto para supersticiosos"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 msgid "[ revoked]"
 msgstr "[  revocada ]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 msgid "[ expired]"
 msgstr "[  caducada ]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 msgid "[ unknown]"
 msgstr "[desconocida]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr "[no definida]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr "[   dudosa  ]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr "[   total   ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr "[  absoluta ]"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr "no definido"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 msgid "never"
 msgstr "nunca"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr "dudosa"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr "total"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr "absoluta"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr "no es necesaria una comprobaci�n de la base de datos de confianza\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "siguiente comprobaci�n de base de datos de confianza el: %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 "no es necesaria una comprobaci�n de la base de datos de confianza\n"
 "con el modelo de confianza `%s'\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 "no es necesario comprobar la base de datos de confianza\n"
 "con el modelo `%s'\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "clave p�blica %s no encontrada: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr "por favor haga un --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 msgid "checking the trustdb\n"
 msgstr "comprobando base de datos de confianza\n"
 
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d claves procesadas (%d validaciones superadas)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 msgid "no ultimately trusted keys found\n"
 msgstr "no se encuentran claves absolutamente fiables\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "clave p�blica de la clave absolutamente fiable %s no encontrada\n"
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d dudosa(s) necesarias, %d completa(s) necesarias,\n"
 "modelo de confianza %s\n"
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6396,7 +6452,7 @@ msgstr ""
 "nivel: %d  validez: %3d  firmada: %3d  confianza: %d-, %dq, %dn, %dm, %df, %"
 "du\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6448,25 +6504,25 @@ msgstr "no puede abrirse el fichero: %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "renombrando `%s' en `%s' fallo: %s\n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr "establece los par�metros de depuraci�n"
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr "habilita depuraci�n completa"
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "Por favor, informe de posibles \"bugs\" a <gnupg-bugs@gnu.org>.\n"
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -6953,7 +7009,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "la comprobaci�n de la firma creada fall�: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Revocaci�n de certificado v�lida"
@@ -7172,16 +7228,6 @@ 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/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "error creando frase contrase�a: %s\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "error escribiendo anillo `%s': %s\n"
-
 #: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
@@ -7326,7 +7372,7 @@ msgstr "a
 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:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
@@ -7407,26 +7453,26 @@ msgstr "no se puede acceder a `%s': %s\n"
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "Cantidad total procesada: %lu\n"
 
-#: sm/import.c:226
+#: sm/import.c:227
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "Certificado correcto"
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "error obteniendo el n�mero de serie: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "error leyendo `%s': %s\n"
@@ -7638,28 +7684,28 @@ msgstr "error enviando a `%s': %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "error enviando a `%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "habilita depuraci�n completa"
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr ""
 
@@ -7675,57 +7721,83 @@ msgstr ""
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:521
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: tools/gpgconf-comp.c:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:533
+#, fuzzy
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|usa modo de contrase�a N"
+
+#: tools/gpgconf-comp.c:537
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "error creando frase contrase�a: %s\n"
+
+#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: tools/gpgconf-comp.c:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 #, 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:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8438,9 +8510,6 @@ msgstr "el resumen protector %d no puede ser utilizado\n"
 #~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 #~ msgstr "todas las opciones de paquete, cifrado y resumen tipo PGP 2.x"
 
-#~ msgid "|N|use passphrase mode N"
-#~ msgstr "|N|usa modo de contrase�a N"
-
 #~ msgid "|NAME|use message digest algorithm NAME for passphrases"
 #~ msgstr ""
 #~ "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE para las contrase�as"
diff --git a/po/et.po b/po/et.po
index 160645a47..0e209e003 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-08-16 11:04+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\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"
@@ -19,54 +19,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: agent/call-pinentry.c:436
+#: agent/call-pinentry.c:438
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:439
+#: agent/call-pinentry.c:441
 #, 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:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 #, fuzzy
 msgid "PIN too long"
 msgstr "rida on liiga pikk\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "liiga pikk parool\n"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Bad PIN"
 msgstr "halb MPI"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "halb parool"
 
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 #, fuzzy
 msgid "Passphrase"
 msgstr "halb parool"
@@ -161,7 +161,28 @@ msgstr "parooli ei korratud 
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "kirjutan faili `%s'\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Sisestage parool\n"
+
+#: agent/genkey.c:165
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Kasutan seda v�tit ikka? "
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -172,50 +193,64 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:98
-#, fuzzy
-msgid "Take this one anyway"
-msgstr "Kasutan seda v�tit ikka? "
+#: agent/genkey.c:202
+#, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] ""
+msgstr[1] ""
 
-#: agent/genkey.c:99 agent/genkey.c:114
-#, fuzzy
-msgid "Enter new passphrase"
-msgstr "Sisestage parool\n"
+#: agent/genkey.c:225
+#, 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 ""
 
-#: agent/genkey.c:107
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+
+#: agent/genkey.c:240
 #, 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:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, 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:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: 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:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: 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:280
+#: agent/genkey.c:412
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muuda parooli"
 
-#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
@@ -226,246 +261,246 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "ole m�nev�rra vaiksem"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "otsi v�tmeid v�tmeserverist"
 
-#: agent/gpg-agent.c:129
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "uuenda usalduse andmebaasi"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:172
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Palun saatke veateated aadressil <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:276
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: agent/gpg-agent.c:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 #, 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:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: kataloog on loodud\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1381
+#: agent/gpg-agent.c:1438
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: kataloogi ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1549
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1554
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1571
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1519
+#: agent/gpg-agent.c:1576
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: j�tsin vahele: %s\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -493,40 +528,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 #, 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:1190
+#: agent/protect-tool.c:1213
 #, 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:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 #, 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:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "halb parool"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Katkesta"
@@ -578,8 +613,8 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -589,7 +624,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr ""
 
@@ -601,58 +636,79 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 #, fuzzy
 msgid "Yes"
 msgstr "jah"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr ""
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+
+#: agent/findkey.c:188 agent/findkey.c:195
+#, fuzzy
+msgid "Change passphrase"
+msgstr "muuda parooli"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr ""
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "faili ei �nnestu avada: %s\n"
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -695,17 +751,17 @@ msgstr "katkestatud kasutaja poolt\n"
 msgid "problem with the agent\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ei �nnestu blokeerida m�lupildi salvestamist: %s\n"
 
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
@@ -1495,7 +1551,7 @@ msgstr "kasutan sekundaarset v
 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:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1628,7 +1684,7 @@ msgstr "|algo [failid]|tr
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1663,7 +1719,7 @@ msgstr "kasuta kanoonilist tekstimoodi"
 msgid "use as output file"
 msgstr "kasuta v�ljundfailina"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "�ra tee mingeid muutusi"
 
@@ -2686,12 +2742,12 @@ msgstr " vahele j
 msgid "          w/o user IDs: %lu\n"
 msgstr "    puudub kasutaja ID: %lu\n"
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "            imporditud: %lu"
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              muutmata: %lu\n"
@@ -2716,22 +2772,22 @@ msgstr "         uusi allkirju: %lu\n"
 msgid "   new key revocations: %lu\n"
 msgstr "      uusi t�histamisi: %lu\n"
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " loetud salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " salajasi v�tmeid imporditud: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " muutmata salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "       pole imporditud: %lu\n"
@@ -3902,13 +3958,13 @@ msgstr ""
 "n�idatud v�tme kehtivus olla tingimata korrektne.\n"
 
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[t�histatud] "
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -3968,7 +4024,7 @@ msgstr "Kustutatud %d allkirja.\n"
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "vigane pakend"
@@ -5136,7 +5192,7 @@ msgstr "binaarne"
 msgid "textmode"
 msgstr "tekstimood"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 msgid "unknown"
 msgstr "tundmatu"
 
@@ -5198,66 +5254,66 @@ msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA �ifri lisandprogrammi pole\n"
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = esita palun t�iendavat infot\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: ebasoovitav v�ti \"%s\"\n"
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "palun kasutage selle asemel \"%s%s\"\n"
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:737
+#: g10/misc.c:739
 msgid "Uncompressed"
 msgstr "Pakkimata"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Pakkimata"
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, 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:1047
+#: g10/misc.c:1049
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
@@ -6096,7 +6152,7 @@ msgstr ""
 "j�tsin `%s' vahele: see on PGP genereeritud ElGamal v�ti,\n"
 "mis ei ole allkirjades kasutamiseks turvaline!\n"
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "usalduse kirje %lu, t��p %d: kirjutamine eba�nnestus: %s\n"
@@ -6144,7 +6200,7 @@ msgstr "viga usalduse kirje otsimisel: %s\n"
 msgid "read error in `%s': %s\n"
 msgstr "viga lugemisel: %s\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync eba�nnestus: %s\n"
@@ -6287,165 +6343,165 @@ msgstr "ei suuda k
 msgid "input line longer than %d characters\n"
 msgstr "sisendrida on pikem, kui %d s�mbolit\n"
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' ei ole kehtiv pikk v�tmeID\n"
 
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "v�ti %08lX: aktsepteerin usaldusv��rse v�tmena\n"
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "v�ti %08lX esineb trustdb failis enam kui korra\n"
 
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "v�ti %08lX: usaldataval v�tmel pole avalikku v�tit - j�tsin vahele\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "v�ti on m�rgitud abslouutselt usaldatuks.\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "usalduse kirje %lu, p�ringu t��p %d: lugemine eba�nnestus: %s\n"
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "usalduse kirje %lu ei oma soovitud t��pi %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[t�histatud] "
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 #, fuzzy
 msgid "[ expired]"
 msgstr "[aegunud] "
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ unknown]"
 msgstr "tundmatu"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 #, fuzzy
 msgid "never"
 msgstr "mitte kunagi"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "trustdb j�rgmine kontroll %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "ei leia avalikku v�tit %08lX: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr "palun tehke --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 msgid "checking the trustdb\n"
 msgstr "kontrollin trustdb faili\n"
 
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d v�tit t��deldud (%d kehtivust puhastatud)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 msgid "no ultimately trusted keys found\n"
 msgstr "absoluutselt usaldatavaid v�tmeid pole\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "puudub absoluutselt usaldatava v�tme %08lX avalik v�ti\n"
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "usalduse kirje %lu, t��p %d: kirjutamine eba�nnestus: %s\n"
@@ -6495,25 +6551,25 @@ msgstr "faili ei 
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "Palun saatke veateated aadressil <gnupg-bugs@gnu.org>.\n"
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -6994,7 +7050,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
@@ -7209,16 +7265,6 @@ msgstr "v
 msgid "no valid recipients given\n"
 msgstr "(Kirjeldust ei antud)\n"
 
-#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "viga parooli loomisel: %s\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "kirjutan faili `%s'\n"
-
 #: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
@@ -7356,7 +7402,7 @@ msgstr "lisa see v
 msgid "add this secret keyring to the list"
 msgstr "lisa see salajaste v�tmete hoidla nimekirja"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
 
@@ -7437,26 +7483,26 @@ msgstr "`%s' ei 
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "T��deldud kokku: %lu\n"
 
-#: sm/import.c:226
+#: sm/import.c:227
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "genereeri t�histamise sertifikaat"
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -7670,27 +7716,27 @@ msgstr "viga teate saatmisel serverile `%s': %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr ""
 
@@ -7706,57 +7752,83 @@ msgstr ""
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:521
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: tools/gpgconf-comp.c:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:533
+#, fuzzy
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|kasuta parooli moodi N"
+
+#: tools/gpgconf-comp.c:537
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "viga parooli loomisel: %s\n"
+
+#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NIMI|kr�pti NIMEle"
 
-#: tools/gpgconf-comp.c:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NIMI|kasuta paroolidega �ifri algoritmi NIMI"
 
-#: tools/gpgconf-comp.c:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8757,9 +8829,6 @@ msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 #~ msgstr ""
 #~ "kasuta k�ikide pakettide, �iffrite ja l�hendi seadeid PGP 2.x moodis"
 
-#~ msgid "|N|use passphrase mode N"
-#~ msgstr "|N|kasuta parooli moodi N"
-
 #~ msgid "|NAME|use message digest algorithm NAME for passphrases"
 #~ msgstr "|NIMI|kasuta paroolidega l�hendialgoritmi NIMI"
 
diff --git a/po/fi.po b/po/fi.po
index 2ed1538bd..38fe73656 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-08-16 11:04+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\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"
@@ -35,54 +35,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: agent/call-pinentry.c:436
+#: agent/call-pinentry.c:438
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:439
+#: agent/call-pinentry.c:441
 #, 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:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 #, fuzzy
 msgid "PIN too long"
 msgstr "rivi on liian pitkä\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "salasana on liian pitkä\n"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI ei kelpaa"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "väärä salasana"
 
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 #, fuzzy
 msgid "Passphrase"
 msgstr "väärä salasana"
@@ -177,7 +177,28 @@ msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "virhe luotaessa salasanaa: %s\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "kirjoitetaan kohteeseen \"%s\"\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Syötä salasana\n"
+
+#: agent/genkey.c:165
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -188,50 +209,64 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:98
-#, fuzzy
-msgid "Take this one anyway"
-msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
+#: agent/genkey.c:202
+#, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] ""
+msgstr[1] ""
 
-#: agent/genkey.c:99 agent/genkey.c:114
-#, fuzzy
-msgid "Enter new passphrase"
-msgstr "Syötä salasana\n"
+#: agent/genkey.c:225
+#, 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 ""
 
-#: agent/genkey.c:107
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+
+#: agent/genkey.c:240
 #, 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:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, 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:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: 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:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: 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:280
+#: agent/genkey.c:412
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
@@ -242,104 +277,104 @@ msgstr ""
 "Valitsimet:\n"
 " "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "monisanainen"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "ole jonkinverran hiljaisempi"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: agent/gpg-agent.c:129
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "päivitä luottamustietokanta"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:172
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 tools/symcryptrun.c:204
 #, fuzzy
@@ -347,142 +382,142 @@ msgid "Please report bugs to <"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:276
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: agent/gpg-agent.c:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 #, 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:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: hakemisto luotu\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1381
+#: agent/gpg-agent.c:1438
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: hakemistoa ei voi luoda: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1549
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1554
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1571
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1519
+#: agent/gpg-agent.c:1576
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ohitettu: %s\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 #, 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:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
 
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -510,40 +545,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 #, 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:1190
+#: agent/protect-tool.c:1213
 #, 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:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 #, 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:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "väärä salasana"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Peru"
@@ -595,8 +630,8 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -606,7 +641,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr ""
 
@@ -618,58 +653,79 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 #, fuzzy
 msgid "Yes"
 msgstr "kyllä|kylla|joo"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr ""
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+
+#: agent/findkey.c:188 agent/findkey.c:195
+#, fuzzy
+msgid "Change passphrase"
+msgstr "muuta salasanaa"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr ""
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -712,17 +768,17 @@ msgstr "käyttäjän peruma\n"
 msgid "problem with the agent\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
 
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "core-tiedostojen luontia ei voi estää: %s\n"
 
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
@@ -1514,7 +1570,7 @@ msgstr ""
 "avain %08lX: salaisella avaimella ei ole vastaavaa \n"
 "julkista avainta - ohitetaan\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1647,7 +1703,7 @@ msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1682,7 +1738,7 @@ msgstr "käytä tekstimuotoa"
 msgid "use as output file"
 msgstr "käytä tulostustiedostona"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "älä tee muutoksia"
 
@@ -2715,12 +2771,12 @@ msgstr "      ohitetaan uudet avaimet: %lu\n"
 msgid "          w/o user IDs: %lu\n"
 msgstr "          ilman käyttäjätunnuksia: %lu\n"
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "              tuotu: %lu"
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             muuttamatonta: %lu\n"
@@ -2745,22 +2801,22 @@ msgstr "        uusia allekirjoituksia: %lu\n"
 msgid "   new key revocations: %lu\n"
 msgstr "   uusia avainten mitätöintejä: %lu\n"
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      luettuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  tuotuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " muuttamattomia salaisia avaimia: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          ei tuotu: %lu\n"
@@ -3937,13 +3993,13 @@ msgstr ""
 "ajan tasalla jollet käynnistä ohjelmaa uudelleen\n"
 
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[mitätöity] "
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4003,7 +4059,7 @@ msgstr "%d allekirjoitusta poistettu.\n"
 msgid "Nothing deleted.\n"
 msgstr "Mitään ei poistettu.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "virheellinen ascii-koodaus"
@@ -5187,7 +5243,7 @@ msgstr "binääri"
 msgid "textmode"
 msgstr "teksti"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 msgid "unknown"
 msgstr "tuntematon "
 
@@ -5252,66 +5308,66 @@ msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA-salaimen liitännäinen ei käytettävissä\n"
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = näytä lisätietoja\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: paheksuttava valitsin \"%s\"\n"
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "käytä valitsinta \"%s%s\" sen sijaan\n"
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:737
+#: g10/misc.c:739
 msgid "Uncompressed"
 msgstr "pakkaamaton"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "pakkaamaton"
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, 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:1047
+#: g10/misc.c:1049
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
@@ -6172,7 +6228,7 @@ msgstr ""
 "ohitetaan \"%s\": tämä on PGP:n luoma ElGamal-avain, jolla ei voi "
 "allekirjoittaa turvallisesti!\n"
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
@@ -6220,7 +6276,7 @@ msgstr "virhe etsittäessä luottamustietuetta: %s\n"
 msgid "read error in `%s': %s\n"
 msgstr "lukuvirhe: %s\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: synkronointi epäonnistui: %s\n"
@@ -6363,166 +6419,166 @@ msgstr "yli %d merkkiä pitkiä tekstirivejä ei voi käsitellä\n"
 msgid "input line longer than %d characters\n"
 msgstr "syöterivi on yli %d merkkiä pitkä\n"
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "\"%s\" ei kelpaa pitkänä avaintunnuksena\n"
 
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "avain %08lX: hyväksytty luotettuna avaimena\n"
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "avain %08lX esiintyy trustdb:ssä useammin kuin kerran\n"
 
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "avain %08lX: luotetulle avaimelle ei löydy julkista avainta - ohitetaan\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "Avain on määritelty ehdottoman luotettavaksi.\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "luottamustietue %lu, pyyntötyyppi %d: luku epäonnistui: %s\n"
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "luottamustietue %lu ei ole pyydettyä tyyppiä %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[mitätöity] "
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 #, fuzzy
 msgid "[ expired]"
 msgstr "[vanhentunut] "
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ unknown]"
 msgstr "tuntematon "
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 #, fuzzy
 msgid "never"
 msgstr "ei koskaan"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "seuraava trustdb tarkistus %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "julkista avainta %08lX ei löydy: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr "tee --check-trustdb, kiitos\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 msgid "checking the trustdb\n"
 msgstr "tarkistetaan trustdb:tä\n"
 
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 msgid "no ultimately trusted keys found\n"
 msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "ehdottomasti luotettu julkinen avain %08lX ei löytynyt\n"
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
@@ -6572,26 +6628,26 @@ msgstr "ei voi avata tiedostoa: %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 #, fuzzy
 msgid "Please report bugs to "
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <gnupg-bugs@gnu.org>.\n"
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -7073,7 +7129,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
@@ -7288,16 +7344,6 @@ msgstr "avainlohkojen poisto epäonnistui: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(Kuvausta ei annettu)\n"
 
-#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "virhe luotaessa salasanaa: %s\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "kirjoitetaan kohteeseen \"%s\"\n"
-
 #: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
@@ -7435,7 +7481,7 @@ msgstr "lisää tämä avainrengas avainrenkaiden luetteloon"
 msgid "add this secret keyring to the list"
 msgstr "lisää tämä salainen avainrengas luetteloon"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
 
@@ -7516,26 +7562,26 @@ msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "Kaikkiaan käsitelty: %lu\n"
 
-#: sm/import.c:226
+#: sm/import.c:227
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "luo mitätöintivarmenne"
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -7749,27 +7795,27 @@ msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr ""
 
@@ -7785,57 +7831,83 @@ msgstr ""
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:521
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: tools/gpgconf-comp.c:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:533
+#, fuzzy
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|käytä salasanoissa toimintatapaa N"
+
+#: tools/gpgconf-comp.c:537
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "virhe luotaessa salasanaa: %s\n"
+
+#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: tools/gpgconf-comp.c:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NIMI|käytä salasanoihin salausalgoritmia NIMI"
 
-#: tools/gpgconf-comp.c:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8843,9 +8915,6 @@ msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 #~ msgstr ""
 #~ "aseta kaikki paketti-, salain- ja tiivistevaihtoehdot PGP 2.x -muotoon"
 
-#~ msgid "|N|use passphrase mode N"
-#~ msgstr "|N|käytä salasanoissa toimintatapaa N"
-
 #~ msgid "|NAME|use message digest algorithm NAME for passphrases"
 #~ msgstr "|NIMI|käytä salasanoihin viestintiivistealgoritmia NIMI"
 
diff --git a/po/fr.po b/po/fr.po
index c3cf7199f..fe96b7e4f 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-08-16 11:04+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\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"
@@ -24,54 +24,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "impossible de stocker l'empreinte: %s\n"
 
-#: agent/call-pinentry.c:436
+#: agent/call-pinentry.c:438
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:439
+#: agent/call-pinentry.c:441
 #, 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:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 #, fuzzy
 msgid "PIN too long"
 msgstr "ligne trop longue"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "ligne trop longue"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Bad PIN"
 msgstr "mauvais entier en pr�cision multiple (MPI)"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "mauvaise phrase de passe"
 
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 #, fuzzy
 msgid "Passphrase"
 msgstr "mauvaise phrase de passe"
@@ -169,7 +169,30 @@ msgstr "le code PIN n'a pas 
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr ""
+"%s: erreur pendant l'�criture de l'enregistrement de\n"
+"r�pertoire: %s\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Entrez la phrase de passe\n"
+
+#: agent/genkey.c:165
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Utiliser cette cl� quand m�me ? (o/N) "
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -180,28 +203,42 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:98
-#, fuzzy
-msgid "Take this one anyway"
-msgstr "Utiliser cette cl� quand m�me ? (o/N) "
+#: agent/genkey.c:202
+#, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] ""
+msgstr[1] ""
 
-#: agent/genkey.c:99 agent/genkey.c:114
-#, fuzzy
-msgid "Enter new passphrase"
-msgstr "Entrez la phrase de passe\n"
+#: agent/genkey.c:225
+#, 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 ""
 
-#: agent/genkey.c:107
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+
+#: agent/genkey.c:240
 #, 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:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
@@ -209,22 +246,22 @@ msgstr ""
 "secr�te.\n"
 "\n"
 
-#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: 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:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: 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:280
+#: agent/genkey.c:412
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "changer la phrase de passe"
 
-#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
@@ -235,106 +272,106 @@ msgstr ""
 "Options:\n"
 " "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "bavard"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "lire les options de `%s'\n"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: 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:129
+#: agent/gpg-agent.c:135
 #, 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:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "mettre la base de confiance � jour"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:172
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 tools/symcryptrun.c:204
 #, fuzzy
@@ -343,144 +380,144 @@ 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:260
+#: agent/gpg-agent.c:276
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: agent/gpg-agent.c:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, 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:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, 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:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 #, 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:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, 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:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "�criture de la cl� secr�te dans `%s'\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "r�pertoire `%s' cr��\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) �chou� dans %s: %s\n"
 
-#: agent/gpg-agent.c:1381
+#: agent/gpg-agent.c:1438
 #, 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:1492
+#: agent/gpg-agent.c:1549
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1554
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1571
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1519
+#: agent/gpg-agent.c:1576
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, 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:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignor�: %s\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 #, 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:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 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:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -508,40 +545,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 #, 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:1190
+#: agent/protect-tool.c:1213
 #, 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:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 #, 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:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "mauvaise phrase de passe"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, 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:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "annul�"
@@ -593,8 +630,8 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -604,7 +641,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr ""
 
@@ -616,60 +653,81 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 #, fuzzy
 msgid "Yes"
 msgstr "oui"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr ""
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+
+#: agent/findkey.c:188 agent/findkey.c:195
+#, fuzzy
+msgid "Change passphrase"
+msgstr "changer la phrase de passe"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr ""
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr ""
 "erreur durant la lecture des informations contenues actuellement\n"
 "dans la cl�: %s\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
@@ -711,19 +769,19 @@ msgstr "annul
 msgid "problem with the agent\n"
 msgstr "probl�me avec l'agent - arr�t d'utilisation de l'agent\n"
 
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossible d'emp�cher la g�n�ration de fichiers �core�: %s\n"
 
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire de l'extension `%s' est peu\n"
 "s�r\n"
 
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
@@ -1499,7 +1557,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:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1631,7 +1689,7 @@ msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1666,7 +1724,7 @@ msgstr "utiliser le mode texte canonique"
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
@@ -2740,12 +2798,12 @@ msgstr "       nouvelles cl
 msgid "          w/o user IDs: %lu\n"
 msgstr "        sans nom d'utilisateur: %lu\n"
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      import�e: %lu"
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                     inchang�e: %lu\n"
@@ -2770,22 +2828,22 @@ msgstr "          nouvelles signatures: %lu\n"
 msgid "   new key revocations: %lu\n"
 msgstr " nouvelles r�vocations de cl�s: %lu\n"
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "            cl�s secr�tes lues: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "       cl�s secr�tes import�es: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      cl�s secr�tes inchang�es: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                  non import�e: %lu\n"
@@ -3935,12 +3993,12 @@ msgstr ""
 "correcte tant que vous n'avez pas relanc� le programme.\n"
 
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "revoqu�e"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "expir�e"
 
@@ -4002,7 +4060,7 @@ msgstr "%d signatures supprim
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a �t� supprim�.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "invalide"
 
@@ -5191,7 +5249,7 @@ msgstr "binaire"
 msgid "textmode"
 msgstr "modetexte"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 msgid "unknown"
 msgstr "inconnu"
 
@@ -5261,67 +5319,67 @@ msgstr ""
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVERTISSEMENT: l'algorithme de hachage %s est d�conseill�\n"
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "le module de chiffrement IDEA n'est pas pr�sent\n"
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "voir http://www.gnupg.org/fr/faq.html pour plus d'informations\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: option d�conseill�e \"%s\"\n"
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTISSEMENT: \"%s\" est une option d�conseill�e.\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "utilisez \"%s%s\" � la place\n"
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "AVERTISSEMENT: \"%s\" est une commande d�conseill�e - ne\n"
 "l'utilisez pas\n"
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVERTISSEMENT: \"%s\" est une option d�conseill�e.\n"
 
-#: g10/misc.c:737
+#: g10/misc.c:739
 msgid "Uncompressed"
 msgstr "Non-compress�"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 msgid "uncompressed|none"
 msgstr "noncompress�|non"
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, 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:1047
+#: g10/misc.c:1049
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "option ambigu� `%s'\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "option `%s' inconnue\n"
@@ -6187,7 +6245,7 @@ msgstr ""
 "c'est une cl� ElGamal g�n�r�e par PGP qui n'est pas s�re pour\n"
 "les signatures !"
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "enregistrement de confiance %lu, type %d: l'�criture a �chou�: %s\n"
@@ -6234,7 +6292,7 @@ msgstr ""
 msgid "read error in `%s': %s\n"
 msgstr "erreur de lecture dans `%s': %s\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de confiance: la synchronisation a �chou�: %s\n"
@@ -6380,165 +6438,165 @@ msgstr "impossible de traiter les lignes plus longues que %d caract
 msgid "input line longer than %d characters\n"
 msgstr "la ligne d'entr�e est plus longue que %d caract�res\n"
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' n'est pas une identification de cl� longue valide\n"
 
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "cl� %s: accept�e comme cl� de confiance.\n"
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "la cl� %s appara�t plusieurs fois dans la base de confiance\n"
 
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "cl� %s: pas de cl� publique pour la cl� de confiance - ignor�e\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "cl� %s marqu�e comme ayant une confiance ultime.\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 "enregistrement de confiance %lu, type de requ�te %d: la lecture a �chou�: %"
 "s\n"
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "l'enregistrement de confiance %lu: n'est pas du type demand� %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "impossible d'utiliser ce mod�le de confiance inconnu (%d) -\n"
 "on utilise � la place le mod�le de confiance %s\n"
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr "utilisation du mod�le de confiance %s\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "11 le traducteur a bien lu ce qu'il fallait :)"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 msgid "[ revoked]"
 msgstr "[ revoqu�e]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 msgid "[ expired]"
 msgstr "[ expir�e ]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 msgid "[ unknown]"
 msgstr "[ inconnue]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr "[ind�finie]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr "[marginale]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr "[ enti�re ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr "[  ultime ]"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr "ind�finie"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 msgid "never"
 msgstr "jamais"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr "marginale"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr "enti�re"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr "ultime"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr "v�rification de la base de confiance inutile\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "la prochaine v�rification de la base de confiance aura lieu le %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 "v�rification de la base de confiance inutile avec le mod�le de\n"
 "confiance `%s'\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 "mise � jour de la base de confiance inutile avec le mod�le de\n"
 "confiance `%s'\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "cl� publique %s non trouv�e : %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr "faites un --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 msgid "checking the trustdb\n"
 msgstr "v�rifier la base de confiance\n"
 
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d cl�s trait�es (%d comptes de validit� r�initialis�s)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 msgid "no ultimately trusted keys found\n"
 msgstr "aucune cl� de confiance ultime n'a �t� trouv�e\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "la cl� publique de la cl� de confiance ultime %s est introuvable\n"
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d marginale(s) n�cessaires, %d compl�te(s) n�cessaires, mod�le\n"
 "de confiance %s\n"
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6546,7 +6604,7 @@ msgstr ""
 "profondeur: %d  valide: %3d  sign�: %3d\n"
 "confiance: %d-. %dg. %dn. %dm. %df. %du\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6600,27 +6658,27 @@ msgstr "la signature a 
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "renommer `%s' en `%s' a �chou�: %s \n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 #, 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"
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -7101,7 +7159,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
@@ -7319,18 +7377,6 @@ msgstr "la suppression du bloc de cl
 msgid "no valid recipients given\n"
 msgstr "(Aucune description donn�e)\n"
 
-#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr ""
-"%s: erreur pendant l'�criture de l'enregistrement de\n"
-"r�pertoire: %s\n"
-
 #: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
@@ -7473,7 +7519,7 @@ msgstr "enlever les cl
 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:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
@@ -7558,26 +7604,26 @@ msgstr "impossible d'acc
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "       Quantit� totale trait�e: %lu\n"
 
-#: sm/import.c:226
+#: sm/import.c:227
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
@@ -7797,27 +7843,27 @@ msgstr ""
 "erreur pendant la recherche de l'enregistrement de confiance\n"
 "dans `%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr ""
 
@@ -7833,56 +7879,82 @@ msgstr ""
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:521
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: tools/gpgconf-comp.c:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:533
+#, 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:537
+#, 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:638 tools/gpgconf-comp.c:700
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: tools/gpgconf-comp.c:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/gl.po b/po/gl.po
index 2e722e9ae..e46cee208 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-08-16 11:04+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\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"
@@ -19,54 +19,54 @@ msgstr ""
 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:436
+#: agent/call-pinentry.c:438
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:439
+#: agent/call-pinentry.c:441
 #, 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:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 #, fuzzy
 msgid "PIN too long"
 msgstr "li�a longa de m�is\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "contrasinal demasiado longo\n"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter non v�lido no nome\n"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI err�neo"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "contrasinal err�neo"
 
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 #, fuzzy
 msgid "Passphrase"
 msgstr "contrasinal err�neo"
@@ -162,7 +162,28 @@ msgstr "o contrasinal non se repetiu correctamente; t
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "erro ao crea-lo contrasinal: %s\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "escribindo a `%s'\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Introduza o contrasinal\n"
+
+#: agent/genkey.c:165
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "�Empregar esta chave de t�dolos xeitos?"
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -173,50 +194,64 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:98
-#, fuzzy
-msgid "Take this one anyway"
-msgstr "�Empregar esta chave de t�dolos xeitos?"
+#: agent/genkey.c:202
+#, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] ""
+msgstr[1] ""
 
-#: agent/genkey.c:99 agent/genkey.c:114
-#, fuzzy
-msgid "Enter new passphrase"
-msgstr "Introduza o contrasinal\n"
+#: agent/genkey.c:225
+#, 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 ""
 
-#: agent/genkey.c:107
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+
+#: agent/genkey.c:240
 #, 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:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, 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:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: 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:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: 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:280
+#: agent/genkey.c:412
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
@@ -227,106 +262,106 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "lareto"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "ser un pouqui�o m�is calado"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 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:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: agent/gpg-agent.c:129
+#: agent/gpg-agent.c:135
 #, 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:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualiza-la base de datos de confianza"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:172
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 tools/symcryptrun.c:204
 #, fuzzy
@@ -335,142 +370,142 @@ 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:260
+#: agent/gpg-agent.c:276
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: agent/gpg-agent.c:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, 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:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 #, 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:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directorio creado\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, 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:1381
+#: agent/gpg-agent.c:1438
 #, 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:1492
+#: agent/gpg-agent.c:1549
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1554
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1571
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1519
+#: agent/gpg-agent.c:1576
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves omitidas\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 #, 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:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
 
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -498,40 +533,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 #, 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:1190
+#: agent/protect-tool.c:1213
 #, 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:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 #, 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:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "contrasinal err�neo"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancelar"
@@ -583,8 +618,8 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -594,7 +629,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr ""
 
@@ -606,58 +641,79 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 #, fuzzy
 msgid "Yes"
 msgstr "si|sim"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr ""
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+
+#: agent/findkey.c:188 agent/findkey.c:195
+#, fuzzy
+msgid "Change passphrase"
+msgstr "cambia-lo contrasinal"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr ""
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "non se puido abrir un ficheiro: %s\n"
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erro lendo `%s': %s\n"
@@ -700,17 +756,17 @@ msgstr "cancelado polo usuario\n"
 msgid "problem with the agent\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
 
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "non � posible deshabilita-los volcados de 'core': %s\n"
 
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
@@ -1503,7 +1559,7 @@ msgstr "empr
 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:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1636,7 +1692,7 @@ msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1671,7 +1727,7 @@ msgstr "usar modo de texto can
 msgid "use as output file"
 msgstr "usar coma ficheiro de sa�da"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "non facer ning�n cambio"
 
@@ -2700,12 +2756,12 @@ msgstr "novas chaves omitidas: %lu\n"
 msgid "          w/o user IDs: %lu\n"
 msgstr "   sin IDs de usuario: %lu\n"
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importadas: %lu"
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          sin cambios: %lu\n"
@@ -2730,22 +2786,22 @@ msgstr "         novas sinaturas: %lu\n"
 msgid "   new key revocations: %lu\n"
 msgstr " novas revocaci�ns de chaves: %lu\n"
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "chaves secretas lidas: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chaves secretas importadas: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chaves secretas sin cambios: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "       non importadas: %lu\n"
@@ -3933,13 +3989,13 @@ msgstr ""
 "correcta a menos que reinicie o programa.\n"
 
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada] "
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4001,7 +4057,7 @@ msgstr "Borradas %d sinaturas.\n"
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "armadura non v�lida"
@@ -5185,7 +5241,7 @@ msgstr "binario"
 msgid "textmode"
 msgstr "modo texto"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 msgid "unknown"
 msgstr "desco�ecido"
 
@@ -5250,66 +5306,66 @@ msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "o plugin de cifra IDEA non est� presente\n"
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = amosar m�is informaci�n\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opci�n a extinguir \"%s\"\n"
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "empregue \"%s%s\" no seu canto\n"
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
 
-#: g10/misc.c:737
+#: g10/misc.c:739
 msgid "Uncompressed"
 msgstr "Sen comprimir"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Sen comprimir"
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, 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:1047
+#: g10/misc.c:1049
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
@@ -6166,7 +6222,7 @@ msgstr ""
 "om�tese `%s': �esta � unha chave ElGamal xerada por PGP que non � segura "
 "para sinaturas!\n"
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
@@ -6214,7 +6270,7 @@ msgstr "erro ao buscar un rexistro de confianza: %s\n"
 msgid "read error in `%s': %s\n"
 msgstr "erro de lectura: %s\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallou a sincronizaci�n: %s\n"
@@ -6360,166 +6416,166 @@ msgstr "non 
 msgid "input line longer than %d characters\n"
 msgstr "a li�a de entrada cont�n m�is de %d caracteres\n"
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' non � un ID longo de chave v�lido\n"
 
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "chave %08lX: aceptada como chave de confianza\n"
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "a chave %08lX aparece m�is dunha vez na base de datos de confianza\n"
 
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "chave %08lX: non hai unha chave p�blica para a chave de confianza - omitida\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "chave marcada coma de confianza absoluta.\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo da petici�n %d: fallou a lectura: %s\n"
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "o rexistro de confianza %lu non � do tipo %d solicitado\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revocada] "
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 #, fuzzy
 msgid "[ expired]"
 msgstr "[caducada ]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ unknown]"
 msgstr "desco�ecido"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 #, fuzzy
 msgid "never"
 msgstr "nunca     "
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "hase comproba-la base de datos de confianza o %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "non se atopou a chave p�blica %08lX: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr "por favor, execute con --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 msgid "checking the trustdb\n"
 msgstr "comprobando a base de datos de confianza\n"
 
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "proces�ronse %d chaves (marc�ronse %d contas de validez)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 msgid "no ultimately trusted keys found\n"
 msgstr "non se atoparon chaves de confianza absoluta\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "non se atopou a chave p�blica da clave de confianza absoluta %08lX\n"
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
@@ -6570,27 +6626,27 @@ msgstr "non se puido abrir un ficheiro: %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr "axusta-los valores de depuraci�n"
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr "habilitar depuraci�n total"
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 #, 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"
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -7079,7 +7135,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Revocaci�n de certificado v�lida"
@@ -7298,16 +7354,6 @@ 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/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "erro ao crea-lo contrasinal: %s\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "escribindo a `%s'\n"
-
 #: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
@@ -7445,7 +7491,7 @@ msgstr "engadir este chaveiro 
 msgid "add this secret keyring to the list"
 msgstr "engadir este chaveiro secreto � lista"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 
@@ -7526,26 +7572,26 @@ msgstr "non se pode pechar `%s': %s\n"
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "N�mero total procesado: %lu\n"
 
-#: sm/import.c:226
+#: sm/import.c:227
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "Certificado correcto"
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro lendo `%s': %s\n"
@@ -7759,28 +7805,28 @@ msgstr "erro ao enviar a `%s': %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "habilitar depuraci�n total"
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr ""
 
@@ -7796,57 +7842,83 @@ msgstr ""
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:521
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: tools/gpgconf-comp.c:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:533
+#, fuzzy
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|emprega-lo modo de contrasinal N"
+
+#: tools/gpgconf-comp.c:537
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "erro ao crea-lo contrasinal: %s\n"
+
+#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOME|cifrar para NOME"
 
-#: tools/gpgconf-comp.c:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 #, 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:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8868,9 +8940,6 @@ msgstr "o algoritmo de protecci
 #~ "axustar t�dalas opci�ns de paquetes, cifrado e resumo ao comportamento "
 #~ "PGP 2.x"
 
-#~ msgid "|N|use passphrase mode N"
-#~ msgstr "|N|emprega-lo modo de contrasinal N"
-
 #~ msgid "|NAME|use message digest algorithm NAME for passphrases"
 #~ msgstr "|NOME|emprega-lo algoritmo para resumos NOME para os contrasinais"
 
diff --git a/po/hu.po b/po/hu.po
index d5768be2b..24bed108a 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-08-16 11:04+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\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"
@@ -19,54 +19,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: agent/call-pinentry.c:436
+#: agent/call-pinentry.c:438
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:439
+#: agent/call-pinentry.c:441
 #, 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:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 #, fuzzy
 msgid "PIN too long"
 msgstr "A sor t�l hossz�!\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "A jelsz� t�l hossz�!\n"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "�rv�nytelen karakter a n�vben!\n"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Bad PIN"
 msgstr "hib�s MPI"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "rossz jelsz�"
 
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 #, fuzzy
 msgid "Passphrase"
 msgstr "rossz jelsz�"
@@ -161,7 +161,28 @@ msgstr "Nem ism
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "�rok a \"%s\" �llom�nyba.\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "�rja be a jelsz�t!\n"
+
+#: agent/genkey.c:165
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "M�gis haszn�ljuk ezt a kulcsot? "
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -172,50 +193,64 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:98
-#, fuzzy
-msgid "Take this one anyway"
-msgstr "M�gis haszn�ljuk ezt a kulcsot? "
+#: agent/genkey.c:202
+#, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] ""
+msgstr[1] ""
 
-#: agent/genkey.c:99 agent/genkey.c:114
-#, fuzzy
-msgid "Enter new passphrase"
-msgstr "�rja be a jelsz�t!\n"
+#: agent/genkey.c:225
+#, 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 ""
 
-#: agent/genkey.c:107
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+
+#: agent/genkey.c:240
 #, 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:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, 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:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: 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:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: 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:280
+#: agent/genkey.c:412
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
@@ -226,246 +261,246 @@ msgstr ""
 "Opci�k:\n"
 " "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "b�besz�d� m�d"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "m�g sz�kszav�bb m�d"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 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:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "kulcsok keres�se kulcsszerveren"
 
-#: agent/gpg-agent.c:129
+#: agent/gpg-agent.c:135
 #, 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:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "bizalmi adatb�zis friss�t�se"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:172
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 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:260
+#: agent/gpg-agent.c:276
 #, 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:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, 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:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, 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:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 #, 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:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, 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:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: K�nyvt�rat l�trehoztam.\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, 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:1381
+#: agent/gpg-agent.c:1438
 #, 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:1492
+#: agent/gpg-agent.c:1549
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1554
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1571
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1519
+#: agent/gpg-agent.c:1576
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
 
-#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: kihagyva: %s\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 #, 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:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 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:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -493,40 +528,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 #, 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:1190
+#: agent/protect-tool.c:1213
 #, 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:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 #, 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:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "rossz jelsz�"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, 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:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "M�gsem"
@@ -578,8 +613,8 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -589,7 +624,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr ""
 
@@ -601,58 +636,79 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 #, fuzzy
 msgid "Yes"
 msgstr "igen"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr ""
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+
+#: agent/findkey.c:188 agent/findkey.c:195
+#, fuzzy
+msgid "Change passphrase"
+msgstr "jelsz�v�ltoztat�s"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr ""
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@ -695,17 +751,17 @@ msgstr "A felhaszn
 msgid "problem with the agent\n"
 msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
 
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "Nem tudom letiltani a core f�jlokat: %s.\n"
 
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
@@ -1492,7 +1548,7 @@ msgstr "A %08lX m
 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:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1625,7 +1681,7 @@ msgstr "|algo [f
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1660,7 +1716,7 @@ msgstr "kanonikus sz
 msgid "use as output file"
 msgstr "kimeneti �llom�ny megad�sa"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "ne csin�ljon semmi v�ltoztat�st"
 
@@ -2692,12 +2748,12 @@ msgstr "       
 msgid "          w/o user IDs: %lu\n"
 msgstr "    felh. azonos�t� n�lk�l: %lu\n"
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "                import�lva: %lu"
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "               v�ltozatlan: %lu\n"
@@ -2722,22 +2778,22 @@ msgstr "              
 msgid "   new key revocations: %lu\n"
 msgstr "     �j kulcsvisszavon�sok: %lu\n"
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   olvasott titkos kulcsok: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  import�lt titkos kulcsok: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "v�ltozatlan titkos kulcsok: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             nem import�lt: %lu\n"
@@ -3910,13 +3966,13 @@ msgstr ""
 "felt�tlen�l helyes, am�g �jra nem ind�tja a programot!\n"
 
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[visszavont] "
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -3977,7 +4033,7 @@ msgstr "T
 msgid "Nothing deleted.\n"
 msgstr "Nem t�r�ltem semmit.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "�rv�nytelen p�nc�l"
@@ -5160,7 +5216,7 @@ msgstr "Bin
 msgid "textmode"
 msgstr "Sz�vegm�d�"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 msgid "unknown"
 msgstr "Ismeretlen m�d�"
 
@@ -5223,66 +5279,66 @@ msgstr ""
 "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
 "a c�mzett preferenci�ival.\n"
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "Az IDEA rejtjelez� b�v�t�s nincs jelen!\n"
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = tov�bbi inform�ci�kat k�rek\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: Elavult opci�: \"%s\"\n"
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "K�rem, ezt haszn�lja helyette: \"%s%s\"\n"
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#: g10/misc.c:737
+#: g10/misc.c:739
 msgid "Uncompressed"
 msgstr "t�m�r�tetlen"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "t�m�r�tetlen"
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, 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:1047
+#: g10/misc.c:1049
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
@@ -6135,7 +6191,7 @@ msgstr ""
 "Kihagytam \"%s\"-t: ez egy PGP �ltal l�trehozott ElGamal kulcs, amely nem\n"
 "biztons�gos al��r�sokhoz!\n"
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "%lu bizalmi rekord, %d t�pus: �r�s sikertelen: %s.\n"
@@ -6183,7 +6239,7 @@ msgstr "Hiba bizalmi rekord keres
 msgid "read error in `%s': %s\n"
 msgstr "Olvas�si hiba: %s.\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "Bizalmi adatb�zis: szinkroniz�ci� sikertelen: %s.\n"
@@ -6326,166 +6382,166 @@ msgstr "Nem tudok %d karaktern
 msgid "input line longer than %d characters\n"
 msgstr "A bemeneti sor hosszabb, mint %d karakter.\n"
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "\"%s\" nem egy �rv�nyes hossz� kulcsazonos�t�.\n"
 
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "%08lX kulcs: Elfogadva megb�zhat� kulcsk�nt.\n"
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "A(z) %08lX kulcs egyn�l t�bbsz�r szerepel a bizalmi adatb�zisban.\n"
 
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "%08lX kulcs: Nincs nyilv�nos kulcs a megb�zhat� kulcshoz - kihagytam.\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "A kulcsot alapvet�en megb�zhat�nak jel�ltem.\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "%lu bizalmi rekord, %d k�r�st�pus: olvas�s sikertelen: %s.\n"
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "%lu bizalmi rekord nem a k�rt t�pus� (%d).\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[visszavont] "
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 #, fuzzy
 msgid "[ expired]"
 msgstr "[lej�rt]     "
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ unknown]"
 msgstr "Ismeretlen m�d�"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 #, fuzzy
 msgid "never"
 msgstr "soha      "
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "A bizalmi adatb�zis k�vetkez� ellen�rz�se: %s.\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "A(z) %08lX nyilv�nos kulcsot nem tal�lom: %s.\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr "K�rem, hajtson v�gre egy --check-trustdb parancsot!\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 msgid "checking the trustdb\n"
 msgstr "Ellen�rz�m a bizalmi adatb�zist.\n"
 
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d kulcsot feldolgoztam (%d �rv�nyess�gsz�ml�l�t t�r�ltem)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 msgid "no ultimately trusted keys found\n"
 msgstr "Nem tal�ltam alapvet�en megb�zhat� kulcsot.\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "Nem tal�lom az alapvet�en megb�zhat� %08lX kulcs nyilv�nos kulcs�t!\n"
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "%lu bizalmi rekord, %d t�pus: �r�s sikertelen: %s.\n"
@@ -6535,25 +6591,25 @@ msgstr "Nem tudom megnyitni az 
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "A hib�kat (angolul) a <gnupg-bugs@gnu.org> c�mre �rja meg!\n"
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -7034,7 +7090,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
@@ -7250,16 +7306,6 @@ msgstr "A kulcsblokk t
 msgid "no valid recipients given\n"
 msgstr "(Nincs le�r�s.)\n"
 
-#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "�rok a \"%s\" �llom�nyba.\n"
-
 #: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
@@ -7397,7 +7443,7 @@ msgstr "kulcskarika hozz
 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:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett titkos kulcsk�nt"
 
@@ -7478,26 +7524,26 @@ msgstr "Nem tudom bez
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "     �sszesen feldolgoztam: %lu\n"
 
-#: sm/import.c:226
+#: sm/import.c:227
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "visszavon�si igazol�s k�sz�t�se"
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@ -7711,27 +7757,27 @@ msgstr "Hiba %s-ra/-re k
 msgid "error sending standard options: %s\n"
 msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr ""
 
@@ -7747,57 +7793,83 @@ msgstr ""
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:521
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: tools/gpgconf-comp.c:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:533
+#, fuzzy
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|N. sorsz�m� jelsz�m�d haszn�lata"
+
+#: tools/gpgconf-comp.c:537
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+
+#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
 #, 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:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|N�V|N�V rejtjelez� algoritmus haszn. jelszavakhoz"
 
-#: tools/gpgconf-comp.c:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8806,9 +8878,6 @@ msgstr "%d%s v
 #~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 #~ msgstr "opci�k PGP 2.x m�dra �ll�t�sa"
 
-#~ msgid "|N|use passphrase mode N"
-#~ msgstr "|N|N. sorsz�m� jelsz�m�d haszn�lata"
-
 #~ msgid "|NAME|use message digest algorithm NAME for passphrases"
 #~ msgstr "|N�V|N�V kivonatol� algoritmus haszn. jelszavakhoz"
 
diff --git a/po/id.po b/po/id.po
index 41afe58d6..6360f3311 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-08-16 11:04+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\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"
@@ -21,54 +21,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: agent/call-pinentry.c:436
+#: agent/call-pinentry.c:438
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:439
+#: agent/call-pinentry.c:441
 #, 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:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 #, fuzzy
 msgid "PIN too long"
 msgstr "baris terlalu panjang\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "passphrase terlalu panjang\n"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI yang buruk"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "passphrase yang buruk"
 
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 #, fuzzy
 msgid "Passphrase"
 msgstr "passphrase yang buruk"
@@ -163,7 +163,28 @@ msgstr "passphrase tidak diulang dengan benar; coba lagi"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "kesalahan penciptaan passphrase: %s\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "menulis ke `%s'\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Masukkan passphrase\n"
+
+#: agent/genkey.c:165
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Tetap gunakan kunci ini? "
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -174,50 +195,64 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:98
-#, fuzzy
-msgid "Take this one anyway"
-msgstr "Tetap gunakan kunci ini? "
+#: agent/genkey.c:202
+#, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] ""
+msgstr[1] ""
 
-#: agent/genkey.c:99 agent/genkey.c:114
-#, fuzzy
-msgid "Enter new passphrase"
-msgstr "Masukkan passphrase\n"
+#: agent/genkey.c:225
+#, 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 ""
 
-#: agent/genkey.c:107
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+
+#: agent/genkey.c:240
 #, 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:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, 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:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: 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:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: 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:280
+#: agent/genkey.c:412
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "ubah passphrase"
 
-#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
@@ -228,246 +263,246 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detil"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cari kunci di key server"
 
-#: agent/gpg-agent.c:129
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "perbarui database trust"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:172
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Laporkan bug ke <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:276
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: agent/gpg-agent.c:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 #, 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:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: direktori tercipta\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1381
+#: agent/gpg-agent.c:1438
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: tidak dapat membuat direktori: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1549
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1554
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1571
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1519
+#: agent/gpg-agent.c:1576
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: dilewati: %s\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -495,40 +530,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/protect-tool.c:1190
+#: agent/protect-tool.c:1213
 #, 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:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 #, 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:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "passphrase yang buruk"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Batal"
@@ -580,8 +615,8 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -591,7 +626,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr ""
 
@@ -603,58 +638,79 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 #, fuzzy
 msgid "Yes"
 msgstr "y|ya"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr ""
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+
+#: agent/findkey.c:188 agent/findkey.c:195
+#, fuzzy
+msgid "Change passphrase"
+msgstr "ubah passphrase"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr ""
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -697,17 +753,17 @@ msgstr "dibatalkan oleh user\n"
 msgid "problem with the agent\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "tidak dapat meniadakan core dump: %s\n"
 
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
@@ -1494,7 +1550,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:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1627,7 +1683,7 @@ msgstr "|algo [file]|cetak digest pesan"
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1662,7 +1718,7 @@ msgstr "gunakan mode teks kanonikal"
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
@@ -2708,12 +2764,12 @@ msgstr "        lewati kunci baru: %lu\n"
 msgid "          w/o user IDs: %lu\n"
 msgstr "         tanpa ID user: %lu\n"
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "             diimpor: %lu"
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "            tidak berubah: %lu\n"
@@ -2738,22 +2794,22 @@ msgstr "       signature baru: %lu\n"
 msgid "   new key revocations: %lu\n"
 msgstr "  pembatalan kunci baru: %lu\n"
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     kunci rahasia dibaca: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  kunci rahasia diimpor: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " kunci rahasia tidak berubah: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "            tidak diimpor: %lu\n"
@@ -3927,13 +3983,13 @@ msgstr ""
 "kecuali anda memulai kembali program.\n"
 
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[revoked] "
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -3994,7 +4050,7 @@ msgstr "Menghapus %d signature.\n"
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "armor tidak valid"
@@ -5170,7 +5226,7 @@ msgstr "biner"
 msgid "textmode"
 msgstr "modeteks"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 msgid "unknown"
 msgstr "tidak dikenal"
 
@@ -5232,66 +5288,66 @@ msgstr "%s signature, algoritma digest %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin cipher IDEA tidak tersedia\n"
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = beri saya informasi lebih banyak lagi\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opsi tidak digunakan lagi \"%s\"\n"
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "silakan gunakan \"%s%s\"\n"
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:737
+#: g10/misc.c:739
 msgid "Uncompressed"
 msgstr "Tidak dikompresi"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Tidak dikompresi"
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, 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:1047
+#: g10/misc.c:1049
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
@@ -6139,7 +6195,7 @@ msgstr ""
 "melewati `%s': ini adalah kunci ElGamal yang dihasilkan PGP yang tidak aman "
 "untuk signature!\n"
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
@@ -6187,7 +6243,7 @@ msgstr "kesalahan: gagal menemukan catatan trust: %s\n"
 msgid "read error in `%s': %s\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: gagal sync: %s\n"
@@ -6330,165 +6386,165 @@ msgstr "tidak dapat menangani baris teks lebih dari %d karakter\n"
 msgid "input line longer than %d characters\n"
 msgstr "baris input lebih dari %d karakter\n"
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' bukanlah keyID panjang yang valid\n"
 
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "kunci %08lX: diterima sebagai kunci terpercaya.\n"
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "kunci %08lX muncul lebih dari satu kali dalam trustdb\n"
 
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "kunci %08lX: tidak ada kunci publik untuk trusted key- dilewati\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "kunci ditandai sebagai sangat dipercaya.\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req tipe %d: gagal baca: %s\n"
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "trust record %lu tidak dalam jenis yang diminta %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revoked] "
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 #, fuzzy
 msgid "[ expired]"
 msgstr "[expired] "
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ unknown]"
 msgstr "tidak dikenal"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 #, fuzzy
 msgid "never"
 msgstr "tidak pernah..."
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "pemeriksaan trustdb berikutnya pada %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "kunci publik %08lX tidak ditemukan: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr "lakukanlah --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 msgid "checking the trustdb\n"
 msgstr "memeriksa trustdb\n"
 
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d kunci diproses (%d hitungan validitas dihapus)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 msgid "no ultimately trusted keys found\n"
 msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n"
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
@@ -6538,25 +6594,25 @@ msgstr "tidak dapat membuka file: %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "Laporkan bug ke <gnupg-bugs@gnu.org>.\n"
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -7037,7 +7093,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
@@ -7252,16 +7308,6 @@ msgstr "gagal menghapus keyblok: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(Tidak diberikan deskripsi)\n"
 
-#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "kesalahan penciptaan passphrase: %s\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "menulis ke `%s'\n"
-
 #: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
@@ -7399,7 +7445,7 @@ msgstr "tambah keyring ini ke daftar keyring"
 msgid "add this secret keyring to the list"
 msgstr "tambah keyring rahasia ini ke daftar"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
@@ -7480,26 +7526,26 @@ msgstr "tidak dapat menutup `%s': %s\n"
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "Jumlah yang telah diproses: %lu\n"
 
-#: sm/import.c:226
+#: sm/import.c:227
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "buat sertifikat revokasi"
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -7713,27 +7759,27 @@ msgstr "kesalahan mengirim ke `%s': %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr ""
 
@@ -7749,57 +7795,83 @@ msgstr ""
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:521
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: tools/gpgconf-comp.c:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:533
+#, fuzzy
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|gunakan passphrase mode N"
+
+#: tools/gpgconf-comp.c:537
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "kesalahan penciptaan passphrase: %s\n"
+
+#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: tools/gpgconf-comp.c:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
 
-#: tools/gpgconf-comp.c:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8804,9 +8876,6 @@ msgstr "algoritma proteksi %d%s tidak didukung\n"
 #~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 #~ msgstr "set pilihan semua paket, cipher, digest ke perilaku PGP 2.x"
 
-#~ msgid "|N|use passphrase mode N"
-#~ msgstr "|N|gunakan passphrase mode N"
-
 #~ msgid "|NAME|use message digest algorithm NAME for passphrases"
 #~ msgstr "|NAMA|gunakan algoritma digest NAMA utk passphrase"
 
diff --git a/po/it.po b/po/it.po
index c9ecc5928..4a1881676 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-08-16 11:04+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\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"
@@ -19,54 +19,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: agent/call-pinentry.c:436
+#: agent/call-pinentry.c:438
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:439
+#: agent/call-pinentry.c:441
 #, 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:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 #, fuzzy
 msgid "PIN too long"
 msgstr "riga troppo lunga\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "passphrase troppo lunga\n"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Carattere non valido nel nome\n"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI danneggiato"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "passphrase errata"
 
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 #, fuzzy
 msgid "Passphrase"
 msgstr "passphrase errata"
@@ -161,7 +161,28 @@ msgstr "passphrase non ripetuta correttamente; prova ancora"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "errore nella creazione della passhprase: %s\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "scrittura in `%s'\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Inserisci la passphrase\n"
+
+#: agent/genkey.c:165
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Uso lo stesso questa chiave? "
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -172,50 +193,64 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:98
-#, fuzzy
-msgid "Take this one anyway"
-msgstr "Uso lo stesso questa chiave? "
+#: agent/genkey.c:202
+#, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] ""
+msgstr[1] ""
 
-#: agent/genkey.c:99 agent/genkey.c:114
-#, fuzzy
-msgid "Enter new passphrase"
-msgstr "Inserisci la passphrase\n"
+#: agent/genkey.c:225
+#, 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 ""
 
-#: agent/genkey.c:107
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+
+#: agent/genkey.c:240
 #, 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:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, 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:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: 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:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: 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:280
+#: agent/genkey.c:412
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "cambia la passphrase"
 
-#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
@@ -226,246 +261,246 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "prolisso"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: 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:129
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aggiorna il database della fiducia"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:172
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 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:260
+#: agent/gpg-agent.c:276
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: agent/gpg-agent.c:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, 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:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "impossibile creare la directory `%s': %s\n"
 
-#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 #, 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:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directory creata\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1381
+#: agent/gpg-agent.c:1438
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: impossibile creare la directory: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1549
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1554
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1571
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1519
+#: agent/gpg-agent.c:1576
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: saltata: %s\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -493,40 +528,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 #, 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:1190
+#: agent/protect-tool.c:1213
 #, 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:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 #, 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:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "passphrase errata"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancella"
@@ -578,8 +613,8 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -589,7 +624,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr ""
 
@@ -601,58 +636,79 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 #, fuzzy
 msgid "Yes"
 msgstr "si|s�"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr ""
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+
+#: agent/findkey.c:188 agent/findkey.c:195
+#, fuzzy
+msgid "Change passphrase"
+msgstr "cambia la passphrase"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr ""
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "impossibile aprire il file: %s\n"
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "errore leggendo `%s': %s\n"
@@ -695,17 +751,17 @@ msgstr "interrotto dall'utente\n"
 msgid "problem with the agent\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
 
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossibile disabilitare i core dump: %s\n"
 
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
@@ -1503,7 +1559,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:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1636,7 +1692,7 @@ msgstr "|algo [files]|stampa tutti i message digests"
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1671,7 +1727,7 @@ msgstr "usa il modo testo canonico"
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
@@ -2713,12 +2769,12 @@ msgstr "  nuove chiavi saltate: %lu\n"
 msgid "          w/o user IDs: %lu\n"
 msgstr "         senza user ID: %lu\n"
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "             importate: %lu"
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "        non modificate: %lu\n"
@@ -2743,22 +2799,22 @@ msgstr "           nuove firme: %lu\n"
 msgid "   new key revocations: %lu\n"
 msgstr "nuove revoche di chiavi: %lu\n"
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "  chiavi segrete lette: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chiavi segrete importate: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chiavi segrete non cambiate: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             importate: %lu\n"
@@ -3934,13 +3990,13 @@ msgstr ""
 "finch� non eseguirai di nuovo il programma.\n"
 
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[revocata]"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4002,7 +4058,7 @@ msgstr "Cancellate %d firme.\n"
 msgid "Nothing deleted.\n"
 msgstr "Non � stato cancellato nulla.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "armatura non valida"
@@ -5190,7 +5246,7 @@ msgstr "binario"
 msgid "textmode"
 msgstr "modo testo"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 msgid "unknown"
 msgstr "sconosciuto"
 
@@ -5252,66 +5308,66 @@ msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "il plugin per il cifrario IDEA non � presente\n"
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostrami ulteriori informazioni\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "usa al suo posto \"%s%s\"\n"
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:737
+#: g10/misc.c:739
 msgid "Uncompressed"
 msgstr "Non compresso"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Non compresso"
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, 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:1047
+#: g10/misc.c:1049
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
@@ -6184,7 +6240,7 @@ msgstr ""
 "saltata %s: questa � una chiave ElGamal generata da PGP che NON � sicura per "
 "le firme!\n"
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, req type %d: write fallita: %s\n"
@@ -6232,7 +6288,7 @@ msgstr "errore cercando il record della fiducia: %s\n"
 msgid "read error in `%s': %s\n"
 msgstr "errore di lettura: %s\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync fallita: %s\n"
@@ -6375,166 +6431,166 @@ msgstr "impossibile gestire linee di testo pi
 msgid "input line longer than %d characters\n"
 msgstr "linea di input pi� lunga di %d caratteri\n"
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' non � un key ID lungo valido\n"
 
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "chiave %08lX: accettata come chiave affidabile\n"
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "chiave %08lX: appare nel trustdb pi� di una volta\n"
 
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "chiave %08lX: manca la chiave pubblica della chiave fidata - ignorata\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "chiavi marcate definitivamente affidabili.\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, tipo %d: read fallita: %s\n"
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "il trust record %lu non � del tipo richiesto %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revocata]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 #, fuzzy
 msgid "[ expired]"
 msgstr "[scaduta]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ unknown]"
 msgstr "sconosciuto"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 #, fuzzy
 msgid "never"
 msgstr "mai       "
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr "non � necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "il prossimoi controllo del trustdb sar� fatto il %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "non � necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "non � necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chiave pubblica %08lX non trovata: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr "per favore usa --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 msgid "checking the trustdb\n"
 msgstr "controllo il trustdb\n"
 
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d chiavi processate (%d conteggi di validit� azzerati)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 msgid "no ultimately trusted keys found\n"
 msgstr "non � stata trovata alcuna chiave definitivamente affidabile\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "chiave pubblica definitivamente affidabile %08lX non trovata\n"
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, req type %d: write fallita: %s\n"
@@ -6584,25 +6640,25 @@ msgstr "impossibile aprire il file: %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "Per favore segnala i bug a <gnupg-bugs@gnu.org>.\n"
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -7083,7 +7139,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
@@ -7298,16 +7354,6 @@ msgstr "cancellazione del keyblock fallita: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(Non � stata data una descrizione)\n"
 
-#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "scrittura in `%s'\n"
-
 #: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
@@ -7445,7 +7491,7 @@ msgstr "aggiungi questo portachiavi alla lista"
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME come chiave segreta predefinita"
 
@@ -7526,26 +7572,26 @@ msgstr "impossibile chiudere `%s': %s\n"
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "Numero totale esaminato: %lu\n"
 
-#: sm/import.c:226
+#: sm/import.c:227
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "genera un certificato di revoca"
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "errore leggendo `%s': %s\n"
@@ -7759,27 +7805,27 @@ msgstr "errore leggendo `%s': %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr ""
 
@@ -7795,57 +7841,83 @@ msgstr ""
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:521
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: tools/gpgconf-comp.c:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:533
+#, fuzzy
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|usa il modo N per la passphrase"
+
+#: tools/gpgconf-comp.c:537
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "errore nella creazione della passhprase: %s\n"
+
+#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOME|cifra per NOME"
 
-#: tools/gpgconf-comp.c:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 #, 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:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8858,9 +8930,6 @@ msgstr "l'algoritmo di protezione %d%s non 
 #~ msgstr ""
 #~ "imposta tutte le opzioni di pacchetto, cifrario e digest per PGP 2.x"
 
-#~ msgid "|N|use passphrase mode N"
-#~ msgstr "|N|usa il modo N per la passphrase"
-
 #~ msgid "|NAME|use message digest algorithm NAME for passphrases"
 #~ msgstr "|NOME|usa l'algoritmo di message digest NOME per le passphrase"
 
diff --git a/po/ja.po b/po/ja.po
index e441144b0..7a20f5e80 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-08-16 11:04+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\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"
@@ -22,54 +22,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: agent/call-pinentry.c:436
+#: agent/call-pinentry.c:438
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:439
+#: agent/call-pinentry.c:441
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/call-pinentry.c:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 #, fuzzy
 msgid "PIN too long"
 msgstr "�Ԥ�Ĺ�����ޤ�"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "�ѥ��ե졼����Ĺ�����ޤ�\n"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Bad PIN"
 msgstr "������MPI�Ǥ�"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "�ѥ��ե졼���������Ǥ�"
 
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 #, fuzzy
 msgid "Passphrase"
 msgstr "�ѥ��ե졼���������Ǥ�"
@@ -164,7 +164,28 @@ msgstr "PIN
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "PIN [��̾��: %lu]"
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "�ѥ��ե졼���κ������顼: %s\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "%s: �ǥ��쥯�ȥ꡼���쥳���ɤν���ߥ��顼: %s\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "�ѥ��ե졼��������\n"
+
+#: agent/genkey.c:165
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "����Ǥ⤳�θ���Ȥ��ޤ���? (y/N) "
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -175,50 +196,64 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:98
-#, fuzzy
-msgid "Take this one anyway"
-msgstr "����Ǥ⤳�θ���Ȥ��ޤ���? (y/N) "
+#: agent/genkey.c:202
+#, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] ""
+msgstr[1] ""
 
-#: agent/genkey.c:99 agent/genkey.c:114
-#, fuzzy
-msgid "Enter new passphrase"
-msgstr "�ѥ��ե졼��������\n"
+#: agent/genkey.c:225
+#, 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 ""
 
-#: agent/genkey.c:107
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+
+#: agent/genkey.c:240
 #, 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:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: 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:280
+#: agent/genkey.c:412
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
@@ -229,246 +264,246 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "����Ť�"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "�������С��θ��򸡺�����"
 
-#: agent/gpg-agent.c:129
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:172
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "�Х��򸫤Ĥ����� <gnupg-bugs@gnu.org> �ޤǤ���𤯤�������\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:276
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: agent/gpg-agent.c:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "��%s�פǿ��ѥ쥳���ɤθ������顼: %s\n"
 
-#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ��Ǥ��ޤ���\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d)��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1381
+#: agent/gpg-agent.c:1438
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1549
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1554
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1571
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1519
+#: agent/gpg-agent.c:1576
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: �����å�: %s\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
 
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -496,40 +531,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/protect-tool.c:1190
+#: agent/protect-tool.c:1213
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "�ѥ��ե졼���������Ǥ�"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "����󥻥�"
@@ -581,8 +616,8 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -592,7 +627,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr ""
 
@@ -604,58 +639,79 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 #, fuzzy
 msgid "Yes"
 msgstr "yes"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr ""
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+
+#: agent/findkey.c:188 agent/findkey.c:195
+#, fuzzy
+msgid "Change passphrase"
+msgstr "�ѥ��ե졼�����ѹ�"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr ""
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "��̾���줿�ǡ�����%s�פ������ޤ���\n"
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "���Ը�����μ������顼: %s\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
@@ -698,17 +754,17 @@ msgstr "
 msgid "problem with the agent\n"
 msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
 
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "����������פ���ѶػߤˤǤ��ޤ���: %s\n"
 
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ�����\n"
@@ -1452,7 +1508,7 @@ msgstr "
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "��%s: �������Τʤ���̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1584,7 +1640,7 @@ msgstr "|
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1623,7 +1679,7 @@ msgstr "
 msgid "use as output file"
 msgstr "���ϥե�����Ȥ��ƻ���"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
@@ -2644,12 +2700,12 @@ msgstr "
 msgid "          w/o user IDs: %lu\n"
 msgstr "  �桼����ID�ʤ�: %lu\n"
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "          �ɹ���: %lu"
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "        �ѹ��ʤ�: %lu\n"
@@ -2674,22 +2730,22 @@ msgstr "      
 msgid "   new key revocations: %lu\n"
 msgstr "  �����������: %lu\n"
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "  ��̩�����ɽФ�: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  ��̩�����ɹ���: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "  ̵�ѹ�����̩��: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        ̤�ɹ���: %lu\n"
@@ -3820,12 +3876,12 @@ msgstr ""
 "�Ȥ������Ȥ�ǰƬ�ˤ����Ƥ���������\n"
 
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "����"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "��λ"
 
@@ -3884,7 +3940,7 @@ msgstr "%d
 msgid "Nothing deleted.\n"
 msgstr "���������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "̵���������Ǥ�"
@@ -5030,7 +5086,7 @@ msgstr "
 msgid "textmode"
 msgstr "�ƥ����ȥ⡼��"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 msgid "unknown"
 msgstr "̤�Τ�"
 
@@ -5091,65 +5147,65 @@ msgstr "%s
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA�Ź�ˡ�Υץ饰���󤬤���ޤ���\n"
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "�ܺ٤�http://www.gnupg.org/faq.html������������\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: ����뤵��Ƥ��륪�ץ�����%s��\n"
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "��%s%s�ɤ�����˻ȤäƤ�������\n"
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
-#: g10/misc.c:737
+#: g10/misc.c:739
 msgid "Uncompressed"
 msgstr "̵����"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 msgid "uncompressed|none"
 msgstr "̵����|�ʤ�"
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "���Υ�å������ϡ�%s�Ǥϻ��ѤǤ��ޤ���\n"
 
-#: g10/misc.c:1047
+#: g10/misc.c:1049
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "�����ޤ��ʥ��ץ�����%s��\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "̤�ΤΥ��ץ�����%s��\n"
@@ -5949,7 +6005,7 @@ msgstr "
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "�����PGP����������Elgamal���ǡ���̾�Ѥˤϰ����ǤϤ���ޤ���!"
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "���ѥ쥳����%lu, ��%d: ����ߤ˼��Ԥ��ޤ���: %s\n"
@@ -5994,7 +6050,7 @@ msgstr "
 msgid "read error in `%s': %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "���ѥǡ����١���: Ʊ���˼��Ԥ��ޤ���: %s\n"
@@ -6138,166 +6194,166 @@ msgstr "%dʸ
 msgid "input line longer than %d characters\n"
 msgstr "���ϹԤ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "��%s�פϡ�ͭ�����緿��ID�Ǥ���ޤ���\n"
 
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "��%s: ���Ѥ��븰�Ȥ��Ƽ������ޤ���\n"
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "��%s�����ѥǡ����١�����ʣ������ޤ�\n"
 
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "��%s: ���Ѥ���븰�θ�����������ޤ��� - �ȤФ��ޤ�\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "��%s������Ū�˿��Ѥ���褦��Ͽ���ޤ���\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "���ѥ쥳����%lu, �ꥯ�����ȷ�%d: �ɽФ��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "���ѥ쥳����%lu���׵ᤵ�줿��%d�ǤϤ���ޤ���\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "̤�Το��ѥ�ǥ� (%d) �ϻȤ��ޤ��� - %s���ѥ�ǥ����\n"
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr "%s���ѥ�ǥ�����\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 #, fuzzy
 msgid "[ revoked]"
 msgstr "����"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 #, fuzzy
 msgid "[ expired]"
 msgstr "��λ"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ unknown]"
 msgstr "̤�Τ�"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 #, fuzzy
 msgid "[marginal]"
 msgstr "��������"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 #, fuzzy
 msgid "[ultimate]"
 msgstr "����Ū"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr "̤���"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 msgid "never"
 msgstr "̵����"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr "��������"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr "����"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr "����Ū"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr "���ѥǡ����١����θ����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "����ο��ѥǡ����١��������ϡ�%s�Ǥ�\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "���ѥ�ǥ��%s�פǿ��ѥǡ����١����θ����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "���ѥ�ǥ��%s�פǿ��ѥǡ����١����ι����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "������%s�����Ĥ���ޤ���: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr "--check-trustdb��¹Ԥ��Ƥ�������\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 msgid "checking the trustdb\n"
 msgstr "���ѥǡ����١����θ���\n"
 
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d�ܤθ������ (����%d�ܤ�ͭ�������򥯥ꥢ)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 msgid "no ultimately trusted keys found\n"
 msgstr "����Ū�˿��Ѥ��븰�����Ĥ���ޤ���\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "����Ū�˿��Ѥ��븰%s�θ����������Ĥ���ޤ���\n"
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "�Ǿ��Ρ֤������٤ο��ѡ�%d���Ǿ��Ρ�����Ū���ѡ�%d��%s���ѥ�ǥ�\n"
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr "����: %d  ͭ����: %3d  ��̾: %3d  ����: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6349,25 +6405,25 @@ msgstr "
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "��%s�פ����%s�פؤΰ�ư�˼���: %s\n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "�Х��򸫤Ĥ����� <gnupg-bugs@gnu.org> �ޤǤ���𤯤�������\n"
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -6844,7 +6900,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
@@ -7059,16 +7115,6 @@ msgstr "
 msgid "no valid recipients given\n"
 msgstr "(�����Ϥ���ޤ���)\n"
 
-#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "�ѥ��ե졼���κ������顼: %s\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "%s: �ǥ��쥯�ȥ꡼���쥳���ɤν���ߥ��顼: %s\n"
-
 #: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
@@ -7211,7 +7257,7 @@ msgstr "
 msgid "add this secret keyring to the list"
 msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
@@ -7296,26 +7342,26 @@ msgstr "
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "    ��������: %lu\n"
 
-#: sm/import.c:226
+#: sm/import.c:227
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "���������������"
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "���֤μ������顼: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
@@ -7527,27 +7573,27 @@ msgstr "
 msgid "error sending standard options: %s\n"
 msgstr "��%s�פǿ��ѥ쥳���ɤθ������顼: %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr ""
 
@@ -7563,56 +7609,82 @@ msgstr ""
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:521
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: tools/gpgconf-comp.c:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:533
+#, fuzzy
+msgid "|N|expire the passphrase after N days"
+msgstr "�������"
+
+#: tools/gpgconf-comp.c:537
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "�ѥ��ե졼���κ������顼: %s\n"
+
+#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: tools/gpgconf-comp.c:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/nb.po b/po/nb.po
index 1d2aa2f74..ce605a736 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-08-16 11:04+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\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"
@@ -23,53 +23,53 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
 
-#: agent/call-pinentry.c:436
+#: agent/call-pinentry.c:438
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:439
+#: agent/call-pinentry.c:441
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 
-#: agent/call-pinentry.c:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 #, fuzzy
 msgid "PIN too long"
 msgstr "for lang linje"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "for lang linje"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Ugyldig tegn i navn\n"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Bad PIN"
 msgstr "ugyldig MPI"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "ugyldig passfrase"
 
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 #, fuzzy
 msgid "Passphrase"
 msgstr "ugyldig passfrase"
@@ -164,7 +164,28 @@ msgstr "PIN ble ikke gjentatt korrekt; pr
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "feil ved opprettelse av passfrase: %s\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Tast inn passfrase\n"
+
+#: agent/genkey.c:165
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Bruke denne n�kkelen likevel? (j/N) "
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -175,50 +196,64 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:98
-#, fuzzy
-msgid "Take this one anyway"
-msgstr "Bruke denne n�kkelen likevel? (j/N) "
+#: agent/genkey.c:202
+#, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] ""
+msgstr[1] ""
 
-#: agent/genkey.c:99 agent/genkey.c:114
-#, fuzzy
-msgid "Enter new passphrase"
-msgstr "Tast inn passfrase\n"
+#: agent/genkey.c:225
+#, 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 ""
 
-#: agent/genkey.c:107
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+
+#: agent/genkey.c:240
 #, 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:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, 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:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: 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:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: 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:280
+#: agent/genkey.c:412
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "endre passfrasen"
 
-#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
@@ -229,244 +264,244 @@ msgstr ""
 "Valg:\n"
 " "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "fyldig output"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "v�re noenlunde stille"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "leser valg fra �%s�\n"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: 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:129
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "sette en notasjon for de valgte brukeridene"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "ikke oppdat�r tillitsdatabasen etter import"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:172
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Vennligst rapporter feil til <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:276
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: agent/gpg-agent.c:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MERK: ingen standard valgfil �%s�\n"
 
-#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "valgfil �%s�: %s\n"
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leser valg fra �%s�\n"
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, 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:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skriver hemmelig n�kkel til �%s�\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen �%s� ble opprettet\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) mislyktes in %s: %s\n"
 
-#: agent/gpg-agent.c:1381
+#: agent/gpg-agent.c:1438
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1549
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1554
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1571
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1519
+#: agent/gpg-agent.c:1576
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "oppdatering av hemmelig mislyktes: %s\n"
 
-#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: hoppet over: %s\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -494,37 +529,37 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1190
+#: agent/protect-tool.c:1213
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "ugyldig passfrase"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "cancel|cancel"
@@ -576,8 +611,8 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -587,7 +622,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr ""
 
@@ -599,58 +634,79 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 #, fuzzy
 msgid "Yes"
 msgstr "ja"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr ""
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+
+#: agent/findkey.c:188 agent/findkey.c:195
+#, fuzzy
+msgid "Change passphrase"
+msgstr "endre passfrasen"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr ""
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "kan ikke �pne n�kkelknippet"
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "feil ved lesing av �%s�: %s\n"
@@ -690,17 +746,17 @@ msgstr ""
 msgid "problem with the agent\n"
 msgstr ""
 
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr ""
 
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "ADVARSEL: utrygt eierskap p� utvidelsen �%s�\n"
 
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "ADVARSEL: utrygge rettigheter p� utvidelsen �%s�\n"
@@ -1448,7 +1504,7 @@ msgstr "bruker undern
 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:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1580,7 +1636,7 @@ msgstr "|algo [filer]|skrive meldingsdigester"
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1615,7 +1671,7 @@ msgstr "bruk kanonisk tekstmodus"
 msgid "use as output file"
 msgstr "bruk som outputfil"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "ikke gj�r noen endringer"
 
@@ -2570,12 +2626,12 @@ msgstr "nye n
 msgid "          w/o user IDs: %lu\n"
 msgstr "               uten brukerider: %lu\n"
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "                     importert: %lu"
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                       uendret: %lu\n"
@@ -2600,22 +2656,22 @@ msgstr "                nye signaturer: %lu\n"
 msgid "   new key revocations: %lu\n"
 msgstr "         nye n�kkelopphevinger: %lu\n"
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "        leste hemmelige n�kler: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "   importerte hemmelige n�kler: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "  uforandrede hemmelige n�kler: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                ikke importert: %lu\n"
@@ -3703,12 +3759,12 @@ msgid ""
 msgstr ""
 
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "opphevet"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "utg�tt"
 
@@ -3763,7 +3819,7 @@ msgstr "Slettet %d signaturer.\n"
 msgid "Nothing deleted.\n"
 msgstr "Ingen ble slettet.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "ugyldig"
 
@@ -4915,7 +4971,7 @@ msgstr "bin
 msgid "textmode"
 msgstr "tekstmodus"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 msgid "unknown"
 msgstr "ukjent"
 
@@ -4976,65 +5032,65 @@ msgstr "ADVARSEL: bruker eksperimentell digest-algoritme %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ADVARSEL: digestalgoritmen �%s� er avlegs\n"
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "vennligst se %s for mer informasjon\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr ""
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:737
+#: g10/misc.c:739
 msgid "Uncompressed"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1047
+#: g10/misc.c:1049
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "flertydig valg �%s�\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "ukjent valg �%s�\n"
@@ -5839,7 +5895,7 @@ msgstr ""
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr ""
@@ -5882,7 +5938,7 @@ msgstr "feil ved s
 msgid "read error in `%s': %s\n"
 msgstr "lesefeil ved �%s�: %s\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
@@ -6025,161 +6081,161 @@ msgstr ""
 msgid "input line longer than %d characters\n"
 msgstr ""
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr ""
 
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "n�kkel %s: godtatt som betrodd n�kkel\n"
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "n�kkel %s: ingen offentlig n�kkel for betrodd n�kkel - hoppet over\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "n�kkel %s markert som endelig betrodd.\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr ""
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 msgid "[ revoked]"
 msgstr "[ opphevet]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 msgid "[ expired]"
 msgstr "[ utg�tt]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 msgid "[ unknown]"
 msgstr "[ ukjent]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr "[ udef ]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "fant ikke offentlig n�kkel %s: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 msgid "checking the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6226,25 +6282,25 @@ msgstr "signering mislyktes: %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "Vennligst rapporter feil til <gnupg-bugs@gnu.org>.\n"
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -6715,7 +6771,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
@@ -6930,16 +6986,6 @@ msgstr "sleting av n
 msgid "no valid recipients given\n"
 msgstr "ingen gyldige adressater\n"
 
-#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "feil ved opprettelse av passfrase: %s\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
-
 #: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
@@ -7081,7 +7127,7 @@ msgstr "hent n
 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:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
@@ -7166,26 +7212,26 @@ msgstr "kan ikke aksere 
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "Totalt antall behandlet: %lu\n"
 
-#: sm/import.c:226
+#: sm/import.c:227
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "generere et opphevingssertifikat"
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
@@ -7397,27 +7443,27 @@ msgstr "feil ved lesing av 
 msgid "error sending standard options: %s\n"
 msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr ""
 
@@ -7433,56 +7479,81 @@ msgstr ""
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:521
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: tools/gpgconf-comp.c:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:533
+msgid "|N|expire the passphrase after N days"
+msgstr ""
+
+#: tools/gpgconf-comp.c:537
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "feil ved opprettelse av passfrase: %s\n"
+
+#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAVN|kryptere for NAVN"
 
-#: tools/gpgconf-comp.c:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 90fc57f10..9070bf8f1 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-08-16 11:04+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\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"
@@ -29,54 +29,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: agent/call-pinentry.c:436
+#: agent/call-pinentry.c:438
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:439
+#: agent/call-pinentry.c:441
 #, 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:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 #, fuzzy
 msgid "PIN too long"
 msgstr "linia zbyt d�uga\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "has�o zbyt d�ugie\n"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Bad PIN"
 msgstr "b��d MPI"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "niepoprawne has�o"
 
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 #, fuzzy
 msgid "Passphrase"
 msgstr "niepoprawne has�o"
@@ -172,7 +172,28 @@ msgstr "has
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "b��d podczas tworzenia has�a: %s\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "b��d zapisu zbioru kluczy '%': %s\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Has�o\n"
+
+#: agent/genkey.c:165
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "U�y� tego klucza pomimo to? "
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -183,49 +204,63 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:98
-#, fuzzy
-msgid "Take this one anyway"
-msgstr "U�y� tego klucza pomimo to? "
+#: agent/genkey.c:202
+#, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] ""
+msgstr[1] ""
 
-#: agent/genkey.c:99 agent/genkey.c:114
-#, fuzzy
-msgid "Enter new passphrase"
-msgstr "Has�o\n"
+#: agent/genkey.c:225
+#, 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 ""
 
-#: agent/genkey.c:107
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+
+#: agent/genkey.c:240
 #, 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:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, 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:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: 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:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: 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:280
+#: agent/genkey.c:412
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "zmiana has�a klucza"
 
-#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
@@ -236,247 +271,247 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "z dodatkowymi informacjami"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�ww"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "szukanie kluczy na serwerze"
 
-#: agent/gpg-agent.c:129
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "uaktualnienie bazy zaufania"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:172
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 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:260
+#: agent/gpg-agent.c:276
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: agent/gpg-agent.c:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
-#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nie mo�na utworzy� katalogu ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 #, 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:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, 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:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: katalog utworzony\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, 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:1381
+#: agent/gpg-agent.c:1438
 #, 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:1492
+#: agent/gpg-agent.c:1549
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1554
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1571
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1519
+#: agent/gpg-agent.c:1576
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, 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:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu kluczy pomini�tych\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 #, 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:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "z�y format zmiennej �rodowiskowej GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -504,40 +539,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 #, 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:1190
+#: agent/protect-tool.c:1213
 #, 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:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 #, 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:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "niepoprawne has�o"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, 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:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Anuluj"
@@ -589,8 +624,8 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -600,7 +635,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr ""
 
@@ -612,58 +647,79 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 #, fuzzy
 msgid "Yes"
 msgstr "tak"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr ""
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+
+#: agent/findkey.c:188 agent/findkey.c:195
+#, fuzzy
+msgid "Change passphrase"
+msgstr "zmiana has�a klucza"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr ""
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nie mo�na otworzy� pliku: %s\n"
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
@@ -706,17 +762,17 @@ msgstr "anulowano przez u
 msgid "problem with the agent\n"
 msgstr "problem agenta: zwr�ci� 0x%lx\n"
 
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nie mo�na wy��czy� zrzut�w pami�ci: %s\n"
 
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
@@ -1505,7 +1561,7 @@ msgstr "u
 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:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1638,7 +1694,7 @@ msgstr "|algo [pliki]|skr
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1673,7 +1729,7 @@ msgstr "kanoniczny format tekstowy"
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
@@ -2714,12 +2770,12 @@ msgstr "   pomini
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identyfikatora: %lu\n"
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "         do��czono do zbioru: %lu"
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   bez zmian: %lu\n"
@@ -2744,22 +2800,22 @@ msgstr "             nowych podpis
 msgid "   new key revocations: %lu\n"
 msgstr "   nowych uniewa�nie� kluczy: %lu\n"
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   tajnych kluczy wczytanych: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "     tajnych kluczy dodanych: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    tajnych kluczy bez zmian: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "      nie w��czono do zbioru: %lu\n"
@@ -3939,13 +3995,13 @@ msgstr ""
 "dop�ki program nie zostanie uruchomiony ponownie.\n"
 
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[uniewa�niony]"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "data"
@@ -4006,7 +4062,7 @@ msgstr "%d podpis
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta�o usuni�te.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "niepoprawny"
 
@@ -5189,7 +5245,7 @@ msgstr "binarny"
 msgid "textmode"
 msgstr "tekstowy"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 msgid "unknown"
 msgstr "nieznany"
 
@@ -5251,66 +5307,66 @@ msgstr "podpis %s, skr
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "modu� szyfru IDEA nie jest dost�pny\n"
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = potrzebuj� wi�cej informacji\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d jest przestarza�� opcj� ,,%s''\n"
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "w jej miejsce nale�y u�y� ,,%s%s''\"\n"
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
 
-#: g10/misc.c:737
+#: g10/misc.c:739
 msgid "Uncompressed"
 msgstr "Nieskompresowany"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Nieskompresowany"
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, 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:1047
+#: g10/misc.c:1049
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nieznany domy�lny adresat ,,%s''\n"
@@ -6167,7 +6223,7 @@ msgstr ""
 "pomini�ty ,,%s'': wygenerowany przez PGP klucz dla algorytmu ElGamala,\n"
 "podpisy sk�adane tym kluczem nie zapewniaj� bezpiecze�stwa!\n"
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: zapis nie powi�d� si�: %s\n"
@@ -6215,7 +6271,7 @@ msgstr "b
 msgid "read error in `%s': %s\n"
 msgstr "b��d odczytu: %s\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "baza zaufania: synchronizacja nie powiod�a si� %s\n"
@@ -6359,166 +6415,166 @@ msgstr "nie mo
 msgid "input line longer than %d characters\n"
 msgstr "linia d�u�sza ni� %d znak�w\n"
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr ",,%s'' nie jest poprawnym d�ugim numerem klucza\n"
 
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "klucz %08lX: zaakceptowany jako klucz zaufany\n"
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "klucz %08lX jest wpisany wi�cej ni� raz w bazie zaufania\n"
 
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "klucz %08lX: brak klucza publicznego dla zaufanego klucza - pomini�ty\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "klucz zosta� oznaczony jako obdarzony absolutnym zaufaniem.\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: odczyt nie powi�d� si�: %s\n"
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "wpis zaufania %lu jest typu innego ni� poszukiwany %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[uniewa�niony]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 #, fuzzy
 msgid "[ expired]"
 msgstr "[przeterminowany]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ unknown]"
 msgstr "nieznany"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 #, fuzzy
 msgid "never"
 msgstr "nigdy     "
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nast�pne sprawdzanie bazy odb�dzie si� %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "klucz publiczny %08lX nie odnaleziony: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr "nale�y uruchomi� gpg z opcj� ,,--check-trustdb''\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 msgid "checking the trustdb\n"
 msgstr "sprawdzanie bazy zaufania\n"
 
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "przetworzono %d kluczy (rozwi�zano %d przelicze� zaufania)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 msgid "no ultimately trusted keys found\n"
 msgstr "brak absolutnie zaufanych kluczy\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "klucz publiczny absolutnie zaufanego klucza %08lX nie odnaleziony\n"
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: zapis nie powi�d� si�: %s\n"
@@ -6568,25 +6624,25 @@ msgstr "nie mo
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr "ustawienie opcji �ledzenia wykonania programu"
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr "umo�liwienie pe�nego �ledzenia programu"
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "B��dy prosimy zg�asza� na adres <gnupg-bugs@gnu.org>.\n"
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -7075,7 +7131,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Poprawne uniewa�nienie certyfikatu"
@@ -7294,16 +7350,6 @@ msgstr "usuni
 msgid "no valid recipients given\n"
 msgstr "(nie podano)\n"
 
-#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "b��d podczas tworzenia has�a: %s\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "b��d zapisu zbioru kluczy '%': %s\n"
-
 #: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
@@ -7441,7 +7487,7 @@ msgstr "dodanie zbioru kluczy do u
 msgid "add this secret keyring to the list"
 msgstr "dodanie zbioru kluczy tajnych do u�ywanych"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|ustawienie NAZWA jako domy�lnego klucza prywatnego"
 
@@ -7522,26 +7568,26 @@ msgstr "nie mo
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "Og�em przetworzonych kluczy: %lu\n"
 
-#: sm/import.c:226
+#: sm/import.c:227
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "Poprawny certyfikat"
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
@@ -7755,28 +7801,28 @@ msgstr "b
 msgid "error sending standard options: %s\n"
 msgstr "b��d przy wysy�aniu do ,,%s'': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "umo�liwienie pe�nego �ledzenia programu"
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr ""
 
@@ -7792,57 +7838,83 @@ msgstr ""
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:521
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: tools/gpgconf-comp.c:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:533
+#, fuzzy
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|N-ty tryb obliczania has�a"
+
+#: tools/gpgconf-comp.c:537
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "b��d podczas tworzenia has�a: %s\n"
+
+#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: tools/gpgconf-comp.c:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|ALG|wymuszenie algorytmu szyfruj�cego ALG dla has�a"
 
-#: tools/gpgconf-comp.c:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8882,9 +8954,6 @@ msgstr "algorytm ochrony %d%s nie jest obs
 #~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 #~ msgstr "tryb zgodno�ci format�w, szyfr�w i skr�t�w z PGP 2.x"
 
-#~ msgid "|N|use passphrase mode N"
-#~ msgstr "|N|N-ty tryb obliczania has�a"
-
 #~ msgid "|NAME|use message digest algorithm NAME for passphrases"
 #~ msgstr "|ALG|wymuszenie algorytmu skr�tu has�a ALG"
 
diff --git a/po/pt.po b/po/pt.po
index 160c44a78..1b7989c1f 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-08-16 11:04+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\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"
@@ -22,54 +22,54 @@ msgstr ""
 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:436
+#: agent/call-pinentry.c:438
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:439
+#: agent/call-pinentry.c:441
 #, 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:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 #, fuzzy
 msgid "PIN too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter inv�lido no nome\n"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorreto"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frase secreta incorrecta"
 
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 #, fuzzy
 msgid "Passphrase"
 msgstr "frase secreta incorrecta"
@@ -164,7 +164,28 @@ msgstr "a frase secreta n
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "erro na cria��o da frase secreta: %s\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "a escrever para `%s'\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Insira a frase secreta\n"
+
+#: agent/genkey.c:165
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Usar esta chave de qualquer modo? "
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -175,50 +196,64 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:98
-#, fuzzy
-msgid "Take this one anyway"
-msgstr "Usar esta chave de qualquer modo? "
+#: agent/genkey.c:202
+#, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] ""
+msgstr[1] ""
 
-#: agent/genkey.c:99 agent/genkey.c:114
-#, fuzzy
-msgid "Enter new passphrase"
-msgstr "Insira a frase secreta\n"
+#: agent/genkey.c:225
+#, 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 ""
 
-#: agent/genkey.c:107
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+
+#: agent/genkey.c:240
 #, 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:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, 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:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: 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:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: 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:280
+#: agent/genkey.c:412
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
@@ -229,247 +264,247 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detalhado"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: agent/gpg-agent.c:129
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizar a base de dados de confian�a"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:172
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 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:260
+#: agent/gpg-agent.c:276
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: agent/gpg-agent.c:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, 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:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 #, 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:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directoria criada\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, 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:1381
+#: agent/gpg-agent.c:1438
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1549
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1554
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1571
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1519
+#: agent/gpg-agent.c:1576
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignorado: %s\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 #, 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:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
 
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -497,40 +532,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/protect-tool.c:1190
+#: agent/protect-tool.c:1213
 #, 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:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 #, 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:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "frase secreta incorrecta"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, 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:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "cancelado pelo utilizador\n"
@@ -582,8 +617,8 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -593,7 +628,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr ""
 
@@ -605,58 +640,79 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 #, fuzzy
 msgid "Yes"
 msgstr "sim"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr ""
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+
+#: agent/findkey.c:188 agent/findkey.c:195
+#, fuzzy
+msgid "Change passphrase"
+msgstr "muda a frase secreta"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr ""
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -699,17 +755,17 @@ msgstr "cancelado pelo utilizador\n"
 msgid "problem with the agent\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "imposs�vel desactivar core dumps: %s\n"
 
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
@@ -1496,7 +1552,7 @@ msgstr "usando chave secund
 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:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1629,7 +1685,7 @@ msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1668,7 +1724,7 @@ msgstr "usar modo de texto can
 msgid "use as output file"
 msgstr "usar como ficheiro de sa�da"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
@@ -2702,12 +2758,12 @@ msgstr "      ignorei novas chaves: %lu\n"
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de utilizadores: %lu\n"
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
@@ -2732,22 +2788,22 @@ msgstr "        novas assinaturas: %lu\n"
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        n�o importadas: %lu\n"
@@ -3925,13 +3981,13 @@ msgstr ""
 "correcta a n�o ser que reinicie o programa.\n"
 
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -3990,7 +4046,7 @@ msgstr "%d assinaturas removidas.\n"
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
@@ -5170,7 +5226,7 @@ msgstr "primary"
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
@@ -5235,67 +5291,67 @@ msgstr ""
 "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "o 'plugin' com a cifra IDEA n�o est� presente\n"
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostrar mais informa��es\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: op��o depreciada \"%s\"\n"
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor utilize \"%s%s\" em vez dela\n"
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
 
-#: g10/misc.c:737
+#: g10/misc.c:739
 #, fuzzy
 msgid "Uncompressed"
 msgstr "n�o processado"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "n�o processado"
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, 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:1047
+#: g10/misc.c:1049
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
@@ -6141,7 +6197,7 @@ msgstr ""
 "ignorado `%s': esta � uma chave ElGamal gerada pelo PGP que n�o � segura "
 "para assinaturas!\n"
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registo de confian�a %lu, tipo %d: escrita falhou: %s\n"
@@ -6187,7 +6243,7 @@ msgstr "%s: erro ao escrever registo de diret
 msgid "read error in `%s': %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dados de confian�a: sincroniza��o falhou: %s\n"
@@ -6332,169 +6388,169 @@ msgstr "imposs
 msgid "input line longer than %d characters\n"
 msgstr "linha de entrada maior que %d caracteres\n"
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' n�o � um identificador longo de chave v�lido\n"
 
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "chave %08lX: aceite como chave de confian�a\n"
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "chave %08lX ocrreu mais do que uma vez na base de dados de confian�a\n"
 
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "chave %08lX: nenhuma chave p�blica para chave de confian�a - ignorada\n"
 "\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "chave marcada como de confian�a absoluta\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registo de confian�a %lu, tipo req %d: falha na leitura: %s\n"
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "registo de confian�a %lu n�o � do tipo pedido %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 #, fuzzy
 msgid "[ revoked]"
 msgstr "revkey"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 #, fuzzy
 msgid "[ expired]"
 msgstr "expire"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ unknown]"
 msgstr "vers�o desconhecida"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "proxima verifica��o da base de dados de confian�a a %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chave p�blica %08lX n�o encontrada: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 msgid "checking the trustdb\n"
 msgstr "a verificar a base de dados de confian�a\n"
 
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 "chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registo de confian�a %lu, tipo %d: escrita falhou: %s\n"
@@ -6544,25 +6600,25 @@ msgstr "imposs
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -7043,7 +7099,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
@@ -7260,16 +7316,6 @@ msgstr "remo
 msgid "no valid recipients given\n"
 msgstr "resposta do agente inv�lida\n"
 
-#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "erro na cria��o da frase secreta: %s\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "a escrever para `%s'\n"
-
 #: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
@@ -7409,7 +7455,7 @@ msgstr ""
 msgid "add this secret keyring to the list"
 msgstr "adicionar este porta-chaves secreto � lista"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omiss�o"
 
@@ -7492,26 +7538,26 @@ msgstr "imposs
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: sm/import.c:226
+#: sm/import.c:227
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "gerar um certificado de revoga��o"
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -7725,27 +7771,27 @@ msgstr "erro ao enviar para `%s': %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr ""
 
@@ -7761,59 +7807,85 @@ msgstr ""
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:521
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: tools/gpgconf-comp.c:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:533
+#, fuzzy
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|usar mode de frase secreta N"
+
+#: tools/gpgconf-comp.c:537
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "erro na cria��o da frase secreta: %s\n"
+
+#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOME|cifrar para NOME"
 
-#: tools/gpgconf-comp.c:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 #, 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:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8796,9 +8868,6 @@ msgstr "algoritmo de protec
 #~ "configurar todas as op��es de pacote, cifragem e \"digest\"\n"
 #~ "para comportamento PGP 2.x"
 
-#~ msgid "|N|use passphrase mode N"
-#~ msgstr "|N|usar mode de frase secreta N"
-
 #~ msgid "|NAME|use message digest algorithm NAME for passphrases"
 #~ msgstr ""
 #~ "|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1b5ab8d6e..8054cc371 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-08-16 11:04+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\n"
 "PO-Revision-Date: 2007-08-16 11:35+0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -26,54 +26,54 @@ msgstr ""
 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:436
+#: agent/call-pinentry.c:438
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:439
+#: agent/call-pinentry.c:441
 #, 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:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 #, fuzzy
 msgid "PIN too long"
 msgstr "linha muito longa\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "linha muito longa\n"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caractere inv�lido no nome\n"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorreto"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frase secreta incorreta"
 
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 #, fuzzy
 msgid "Passphrase"
 msgstr "frase secreta incorreta"
@@ -169,7 +169,28 @@ msgstr "A frase secreta n
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "erro na cria��o da frase secreta: %s\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "erro na escrita do chaveiro `%': %s\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Digite a frase secreta: "
+
+#: agent/genkey.c:165
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Usa esta chave de qualquer modo? "
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -180,50 +201,64 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:98
-#, fuzzy
-msgid "Take this one anyway"
-msgstr "Usa esta chave de qualquer modo? "
+#: agent/genkey.c:202
+#, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] ""
+msgstr[1] ""
 
-#: agent/genkey.c:99 agent/genkey.c:114
-#, fuzzy
-msgid "Enter new passphrase"
-msgstr "Digite a frase secreta: "
+#: agent/genkey.c:225
+#, 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 ""
 
-#: agent/genkey.c:107
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+
+#: agent/genkey.c:240
 #, 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:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, 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:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: 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:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: 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:280
+#: agent/genkey.c:412
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
@@ -234,244 +269,244 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detalhado"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "exportar chaves para um servidor"
 
-#: agent/gpg-agent.c:129
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:172
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 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:260
+#: agent/gpg-agent.c:276
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: agent/gpg-agent.c:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, 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:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
 
-#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: diret�rio criado\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, 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:1381
+#: agent/gpg-agent.c:1438
 #, 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:1492
+#: agent/gpg-agent.c:1549
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1554
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1571
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1519
+#: agent/gpg-agent.c:1576
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves ignoradas\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -499,40 +534,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor digite a frase secreta"
 
-#: agent/protect-tool.c:1190
+#: agent/protect-tool.c:1213
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Por favor digite a frase secreta"
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 #, 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:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "frase secreta incorreta"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, 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:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 msgid "cancelled\n"
 msgstr ""
 
@@ -583,8 +618,8 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -594,7 +629,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr ""
 
@@ -606,58 +641,79 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 #, fuzzy
 msgid "Yes"
 msgstr "sim"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr ""
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+
+#: agent/findkey.c:188 agent/findkey.c:195
+#, fuzzy
+msgid "Change passphrase"
+msgstr "muda a frase secreta"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr ""
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "imposs�vel abrir arquivo: %s\n"
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -697,17 +753,17 @@ msgstr ""
 msgid "problem with the agent\n"
 msgstr ""
 
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "imposs�vel desativar core dumps: %s\n"
 
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "%s: novo arquivo de op��es criado\n"
@@ -1495,7 +1551,7 @@ msgstr "usando chave secund
 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:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1634,7 +1690,7 @@ msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1673,7 +1729,7 @@ msgstr "usar modo de texto can
 msgid "use as output file"
 msgstr "usar como arquivo de sa�da"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
@@ -2661,12 +2717,12 @@ msgstr "           novas subchaves: %lu\n"
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de usu�rios: %lu\n"
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
@@ -2691,22 +2747,22 @@ msgstr "        novas assinaturas: %lu\n"
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "              importados: %lu"
@@ -3864,13 +3920,13 @@ msgid ""
 msgstr ""
 
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -3927,7 +3983,7 @@ msgstr "%d assinaturas removidas.\n"
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
@@ -5119,7 +5175,7 @@ msgstr ""
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
@@ -5182,67 +5238,67 @@ msgstr "assinatura %s de: %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:737
+#: g10/misc.c:739
 #, fuzzy
 msgid "Uncompressed"
 msgstr "n�o processado(s)"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "n�o processado(s)"
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1047
+#: g10/misc.c:1049
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
@@ -6082,7 +6138,7 @@ msgstr ""
 "ignorado `%s': esta � uma chave ElGamal gerada pelo PGP que n�o � segura "
 "para assinaturas!\n"
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registro de confian�a %lu, tipo %d: escrita falhou: %s\n"
@@ -6130,7 +6186,7 @@ msgstr "erro lendo registro de diret
 msgid "read error in `%s': %s\n"
 msgstr "erro de leitura: %s\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "banco de dados de confiabilidade: sincroniza��o falhou: %s\n"
@@ -6275,168 +6331,168 @@ msgstr "imposs
 msgid "input line longer than %d characters\n"
 msgstr "linha de entrada maior que %d caracteres\n"
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, fuzzy, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "%s n�o � um mapa de caracteres v�lido\n"
 
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "chave %08lX: aceita como chave confi�vel.\n"
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr ""
 "chave %08lX: imposs�vel coloc�-la no banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registro de confian�a %lu, tipo req %d: falha na leitura: %s\n"
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, fuzzy, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "registro de confian�a %lu: remo��o falhou: %s\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 #, fuzzy
 msgid "[ revoked]"
 msgstr "revkey"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 #, fuzzy
 msgid "[ expired]"
 msgstr "expire"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ unknown]"
 msgstr "vers�o desconhecida"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 #, fuzzy
 msgid "no need for a trustdb check\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, fuzzy, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "inser��o de registro de confian�a falhou: %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chave p�blica n�o encontrada"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "muda os valores de confian�a"
 
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registro de confian�a %lu, tipo %d: escrita falhou: %s\n"
@@ -6486,25 +6542,25 @@ msgstr "imposs
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr "definir par�metros de depura��o"
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr "habilitar depura��o completa"
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -6992,7 +7048,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "leitura de registro de assinatura falhou: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Certificado de revoga��o v�lido"
@@ -7213,16 +7269,6 @@ msgstr "enumera
 msgid "no valid recipients given\n"
 msgstr "nenhum endere�o v�lido\n"
 
-#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "erro na cria��o da frase secreta: %s\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "erro na escrita do chaveiro `%': %s\n"
-
 #: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
@@ -7360,7 +7406,7 @@ msgstr "adicionar este chaveiro 
 msgid "add this secret keyring to the list"
 msgstr "adicionar este chaveiro secreto � lista"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta padr�o"
 
@@ -7443,26 +7489,26 @@ msgstr "imposs
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: sm/import.c:226
+#: sm/import.c:227
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "Certificado correto"
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -7675,28 +7721,28 @@ msgstr "erro na leitura de `%s': %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 #, fuzzy
 msgid "Options useful for debugging"
 msgstr "habilitar depura��o completa"
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr ""
 
@@ -7712,59 +7758,85 @@ msgstr ""
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:521
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: tools/gpgconf-comp.c:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:533
+#, fuzzy
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|usar frase secreta modo N"
+
+#: tools/gpgconf-comp.c:537
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "erro na cria��o da frase secreta: %s\n"
+
+#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOME|criptografar para NOME"
 
-#: tools/gpgconf-comp.c:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 #, 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:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8730,9 +8802,6 @@ msgstr "algoritmo de prote
 #~ "criptografia e \"digest\" para comportamento\n"
 #~ "OpenPGP"
 
-#~ msgid "|N|use passphrase mode N"
-#~ msgstr "|N|usar frase secreta modo N"
-
 #~ msgid "|NAME|use message digest algorithm NAME for passphrases"
 #~ msgstr ""
 #~ "|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
diff --git a/po/ro.po b/po/ro.po
index cb12b468e..3db0ab128 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-08-16 11:04+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\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"
@@ -23,13 +23,13 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "am e�uat s� stochez amprenta: %s\n"
 
-#: agent/call-pinentry.c:436
+#: agent/call-pinentry.c:438
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:439
+#: agent/call-pinentry.c:441
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -37,41 +37,41 @@ msgid ""
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/call-pinentry.c:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 #, fuzzy
 msgid "PIN too long"
 msgstr "linie prea lung�"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "fraz�-parol� prea lung�\n"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter invalid �n nume\n"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorect"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "fraz�-parol� incorect�"
 
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 #, fuzzy
 msgid "Passphrase"
 msgstr "fraz�-parol� incorect�"
@@ -167,7 +167,28 @@ msgstr "PIN-ul nu a fost repetat corect; mai 
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "eroare la crearea frazei-parol�: %s\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "%s: eroare scriere �nregistrare dir: %s\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Introduce�i fraza-parol�\n"
+
+#: agent/genkey.c:165
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Folosi�i oricum aceast� cheie? (d/N) "
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -178,50 +199,64 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:98
-#, fuzzy
-msgid "Take this one anyway"
-msgstr "Folosi�i oricum aceast� cheie? (d/N) "
+#: agent/genkey.c:202
+#, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] ""
+msgstr[1] ""
 
-#: agent/genkey.c:99 agent/genkey.c:114
-#, fuzzy
-msgid "Enter new passphrase"
-msgstr "Introduce�i fraza-parol�\n"
+#: agent/genkey.c:225
+#, 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 ""
 
-#: agent/genkey.c:107
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+
+#: agent/genkey.c:240
 #, 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:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, 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:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: 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:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: 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:280
+#: agent/genkey.c:412
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
@@ -232,246 +267,246 @@ msgstr ""
 "Op�iuni:\n"
 " "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "locvace"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "fii oarecum mai t�cut"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: 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:129
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizeaz� baza de date de �ncredere"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:172
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 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:260
+#: agent/gpg-agent.c:276
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: agent/gpg-agent.c:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, 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:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 #, 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:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "director `%s' creat\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) a e�uat �n %s: %s\n"
 
-#: agent/gpg-agent.c:1381
+#: agent/gpg-agent.c:1438
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: nu pot crea director: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1549
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1554
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1571
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1519
+#: agent/gpg-agent.c:1576
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "actualizarea secretului a e�uat: %s\n"
 
-#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: s�rit�: %s\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
 
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -499,25 +534,25 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 #, 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:1190
+#: agent/protect-tool.c:1213
 #, 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:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
@@ -525,17 +560,17 @@ msgid ""
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "fraz�-parol� incorect�"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "anulat�"
@@ -587,8 +622,8 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -598,7 +633,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr ""
 
@@ -610,58 +645,79 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 #, fuzzy
 msgid "Yes"
 msgstr "da"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr ""
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+
+#: agent/findkey.c:188 agent/findkey.c:195
+#, fuzzy
+msgid "Change passphrase"
+msgstr "schimb� fraza-parol�"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr ""
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nu pot deschide fi�ierul: %s\n"
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "eroare la citire `%s': %s\n"
@@ -704,17 +760,17 @@ msgstr "anulat
 msgid "problem with the agent\n"
 msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
 
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nu pot deactiva generarea fi�ierelor core: %s\n"
 
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru extensia `%s'\n"
 
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
@@ -1469,7 +1525,7 @@ msgstr "folosim subcheia %s 
 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:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1601,7 +1657,7 @@ msgstr "|algo [fi
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1636,7 +1692,7 @@ msgstr "folose
 msgid "use as output file"
 msgstr "folose�te ca fi�ier ie�ire"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "nu face nici o schimbare"
 
@@ -2694,12 +2750,12 @@ msgstr "      chei noi s
 msgid "          w/o user IDs: %lu\n"
 msgstr "  f�r� ID-uri utilizator: %lu\n"
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "               importate: %lu"
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             neschimbate: %lu\n"
@@ -2724,22 +2780,22 @@ msgstr "           noi semn
 msgid "   new key revocations: %lu\n"
 msgstr "    noi revoc�ri de chei: %lu\n"
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     chei secrete citite: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chei secrete importate: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chei secrete neschimbate: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "            ne importate: %lu\n"
@@ -3866,12 +3922,12 @@ msgstr ""
 
 #
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "revocat�"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "expirat�"
 
@@ -3931,7 +3987,7 @@ msgstr "Am 
 msgid "Nothing deleted.\n"
 msgstr "Nu am �ters nimic.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "invalid(�)"
 
@@ -5090,7 +5146,7 @@ msgstr "binar"
 msgid "textmode"
 msgstr "modtext"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 msgid "unknown"
 msgstr "necunoscut"
 
@@ -5152,66 +5208,66 @@ msgstr "AVERTISMENT: folosesc algoritmul rezumat experimental %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVERTISMENT: algoritmul rezumat %s este prea vechi (deprecated)\n"
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin-ul pentru cifrare IDEA nu este prezent\n"
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = arat�-mi mai multe informa�ii\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: op�iune �nvechit� \"%s\"\n"
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "v� rug�m folosi�i \"%s%s\" �n loc\n"
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVERTISMENT: \"%s\" este o comand� �nvechit� - nu o folosi�i\n"
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
 
-#: g10/misc.c:737
+#: g10/misc.c:739
 msgid "Uncompressed"
 msgstr "Necompresat"
 
 #
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 msgid "uncompressed|none"
 msgstr "necompresat|niciunul"
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, 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:1047
+#: g10/misc.c:1049
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "op�iune ambigu� `%s'\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "op�iune necunoscut� `%s'\n"
@@ -6052,7 +6108,7 @@ msgstr ""
 "aceasta este o cheie ElGamal generat� de PGP care nu e sigur� pentru "
 "semn�turi!"
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "�nregistrare �ncredere %lu, tip %d: scrierea a e�uat: %s\n"
@@ -6097,7 +6153,7 @@ msgstr "eroare g
 msgid "read error in `%s': %s\n"
 msgstr "eroare citire �n `%s': %s\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sincronizarea a e�uat: %s\n"
@@ -6240,164 +6296,164 @@ msgstr "nu pot m
 msgid "input line longer than %d characters\n"
 msgstr "linii de intrare mai lungi de %d caractere\n"
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' nu este un ID-cheie de lungime valid�\n"
 
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "cheia %s: acceptat� ca cheie de �ncredere\n"
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "cheia %s apare de mai multe ori �n trustdb\n"
 
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "cheia %s: nici o cheie public� pentru cheia de �ncredere - s�rit�\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "cheia %s marcat� ca av�nd �ncredere suprem�\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "�nregistrare �ncredere %lu, tip req %d: citirea a e�uat: %s\n"
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "�nregistrare �ncredere %lu nu este de tipul cerut %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "nu pot folosi model de �ncredere (%d) - presupun model de �ncredere %s\n"
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr "folosesc model de �ncredere %s\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "10 traduc�tor vezi trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 msgid "[ revoked]"
 msgstr "[revocat�]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 msgid "[ expired]"
 msgstr "[expirat�] "
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 msgid "[ unknown]"
 msgstr "[necunoscut�]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr "[  nedef ]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr "[marginal]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr "[ deplin�]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr "[ suprem�]"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr "nedefinit�"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 msgid "never"
 msgstr "niciodat�"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr "marginal"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr "deplin�"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr "suprem�"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr "nu e nevoie de o verificare trustdb\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "urm�toarea verificare trustdb programat� pe %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "nu e nevoie de o verificare trustdb cu modelul de �ncredere `%s'\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "nu e nevoie de o actualizare trustdb cu modelul de �ncredere `%s'\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "cheia public� %s nu a fost g�sit�: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr "v� rug�m face�i un --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 msgid "checking the trustdb\n"
 msgstr "verific trustdb\n"
 
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d chei procesate (%d num�r�tori valide anulate)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 msgid "no ultimately trusted keys found\n"
 msgstr "nu am g�sit nici o cheie cu �ncredere suprem�\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "cheia public� a cheii cu �ncredere suprem� %s nu a fost g�sit�\n"
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d marginal(e) necesare, %d complet(e) necesare, model de �ncredere %s\n"
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "ad�nc: %d  valid: %3d  semnat: %3d  �ncredere: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6448,25 +6504,25 @@ msgstr "nu pot deschide fi
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "Raporta�i bug-uri la <gnupg-bugs@gnu.org>.\n"
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -6944,7 +7000,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "verificarea semn�turii create a e�uat: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
@@ -7160,16 +7216,6 @@ msgstr "stergere keyblock a e
 msgid "no valid recipients given\n"
 msgstr "(Nici o descriere dat�)\n"
 
-#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "eroare la crearea frazei-parol�: %s\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "%s: eroare scriere �nregistrare dir: %s\n"
-
 #: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
@@ -7308,7 +7354,7 @@ msgstr "adaug
 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:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NUME|folose�te NUME ca cheie secret� implicit�"
 
@@ -7389,26 +7435,26 @@ msgstr "nu pot accesa `%s': %s\n"
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "Num�r total procesate: %lu\n"
 
-#: sm/import.c:226
+#: sm/import.c:227
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "genereaz� un certificat de revocare"
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "eroare la ob�inerea num�rului serial: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "eroare la citire `%s': %s\n"
@@ -7620,27 +7666,27 @@ msgstr "eroare trimitere la `%s': %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr ""
 
@@ -7656,57 +7702,83 @@ msgstr ""
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:521
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: tools/gpgconf-comp.c:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:533
+#, fuzzy
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|folose�te modul fraz�-parol� N"
+
+#: tools/gpgconf-comp.c:537
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "eroare la crearea frazei-parol�: %s\n"
+
+#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: tools/gpgconf-comp.c:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NUME|folose�te algoritm cifrare NUME pentru fraza-parol�"
 
-#: tools/gpgconf-comp.c:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8399,9 +8471,6 @@ msgstr "algoritm rezumat %d nu este suportat\n"
 #~ "seteaz� toate op�iunile pentru pachete, cifru �i rezumat ca pentru "
 #~ "comportamentul PGP 2.x"
 
-#~ msgid "|N|use passphrase mode N"
-#~ msgstr "|N|folose�te modul fraz�-parol� N"
-
 #~ msgid "|NAME|use message digest algorithm NAME for passphrases"
 #~ msgstr "|NUME|folose�te algoritm rezumat mesaj NUME pentru fraza-parol�"
 
diff --git a/po/ru.po b/po/ru.po
index 2f993c97a..b1edb77cf 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-08-16 11:04+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\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"
@@ -21,48 +21,48 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr ""
 
-#: agent/call-pinentry.c:436
+#: agent/call-pinentry.c:438
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr "Введите PIN-код для получения доступа к закрытому ключу"
 
-#: agent/call-pinentry.c:439
+#: agent/call-pinentry.c:441
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Введите фразу-пароль для доступа к закрытому ключу"
 
-#: agent/call-pinentry.c:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 msgid "PIN too long"
 msgstr "PIN слишком длинен"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 msgid "Passphrase too long"
 msgstr "фраза-пароль слишком длинная"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 msgid "Invalid characters in PIN"
 msgstr "Недопустимый символ в PIN-коде"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr "PIN-код слишком короткий"
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 msgid "Bad PIN"
 msgstr "плохой PIN"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 msgid "Bad Passphrase"
 msgstr "Неверная фраза-пароль"
 
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 msgid "Passphrase"
 msgstr "Фраза-пароль"
 
@@ -156,7 +156,28 @@ msgstr "повторный PIN не совпал; попробуйте еще р
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Введите PIN%s%s%s для доступа к карте"
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "ошибка создания временного файла: %s\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "ошибка записи во временный файл: %s\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Введите фразу-пароль\n"
+
+#: agent/genkey.c:165
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Всё равно использовать данный ключ? (y/N)"
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -167,46 +188,60 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:98
-#, fuzzy
-msgid "Take this one anyway"
-msgstr "Всё равно использовать данный ключ? (y/N)"
+#: agent/genkey.c:202
+#, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] ""
+msgstr[1] ""
 
-#: agent/genkey.c:99 agent/genkey.c:114
-#, fuzzy
-msgid "Enter new passphrase"
-msgstr "Введите фразу-пароль\n"
+#: agent/genkey.c:225
+#, 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 ""
 
-#: agent/genkey.c:107
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+
+#: agent/genkey.c:240
 #, 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:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr "Введите фразу-пароль%0Aдля защиты нового ключа"
 
-#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
 msgid "Please re-enter this passphrase"
 msgstr "Повторно введите фразу-пароль:"
 
-#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: 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:280
+#: agent/genkey.c:412
 msgid "Please enter the new passphrase"
 msgstr "Введите новую фразу-пароль"
 
-#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 msgid ""
 "@Options:\n"
@@ -215,109 +250,109 @@ msgstr ""
 "@Параметры:\n"
 " "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr "запуск в режиме сервера (foreground)"
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr "запуск в режиме демона (background)"
 
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "подробно"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "уменьшить количество выводимой информации"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr "вывод результатов в sh-стиле"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr "вывод результатов в csh-стиле"
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|взять параметры из FILE"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr "не отсоединяться от консоли"
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr "не перехватывать события мыши и клавиатуры"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "использовать файл журнала для сервера"
 
-#: agent/gpg-agent.c:129
+#: agent/gpg-agent.c:135
 msgid "use a standard location for the socket"
 msgstr "стандартное расположение сокета"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|использовать PGM как PIN-Entry"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM| использовать PGM как SCdaemon"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 msgid "do not use the SCdaemon"
 msgstr "не использовать SCdaemon"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr "игнорировать запросы смены TTY"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr "игнорировать запросы смены X дисплея"
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|кеш PIN просрочен после N секунд"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr "не использовать кеш PIN при подписывании"
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "позволить клиентам помечать ключи как \"доверяемые\""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:172
 msgid "allow presetting passphrase"
 msgstr "разрешить предустановленную фразу-пароль"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr "разрешить эмуляцию ssh-агента"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FILE|сохранить состояние в файл"
 
-#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 tools/symcryptrun.c:204
 msgid "Please report bugs to <"
 msgstr "О найденных ошибках сообщайте <"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:276
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Использование: gpg-agent [параметры] (-h для подсказки)"
 
-#: agent/gpg-agent.c:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -325,130 +360,130 @@ msgstr ""
 "Синтаксис: gpg-agent [параметры] [команда [аргументы]]\n"
 "Управление закрытыми ключами для GnuPG\n"
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "запрошен недупустимый уровень отладки `%s'\n"
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, fuzzy, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "libksba слишком устаревшая (требуется %s, имеется %s)\n"
 
-#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
 
-#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл конфигурации `%s': %s\n"
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "параметры конфигурации из файла `%s'\n"
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "не могу создать каталог `%s': %s\n"
 
-#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr "имя сокета слишком длинное\n"
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "не могу создать сокет: %s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "нет gpg-agent доступого для данной сессии\n"
 
-#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "ошибка связывния сокета с `%s': %s\n"
 
-#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "слушаем сокет `%s'\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "создан каталог `%s'\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1381
+#: agent/gpg-agent.c:1438
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "невозможно использовать `%s' как домашний каталог\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1549
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1554
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1571
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1519
+#: agent/gpg-agent.c:1576
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s: остановлен\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 msgid "no gpg-agent running in this session\n"
 msgstr "нет gpg-agent доступого для данной сессии\n"
 
-#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -480,21 +515,21 @@ msgstr ""
 "Синтаксис: gpg-protect-tool [параметры] [аргументы]\n"
 "Инструмент для работы с закрытыми ключами\n"
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Введите фразу-пароль для доступа к PKCS#12 объекту."
 
-#: agent/protect-tool.c:1190
+#: agent/protect-tool.c:1213
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Введите фразу-пароль для защиты нового PKCS#12 объекта."
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr "Введите фразу-пароль для защиты импортированных в GnuPG объектов."
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -502,16 +537,16 @@ msgstr ""
 "Введите фразу-пароль или PIN\n"
 "необходимые для выполения данной операции."
 
-#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 msgid "Passphrase:"
 msgstr "Фраза-пароль:"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "ошибка запроса ввода фразы-пароля: %s\n"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 msgid "cancelled\n"
 msgstr "отменено\n"
 
@@ -562,8 +597,8 @@ msgstr "ошибка чтения списка доверяемых корнев
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -575,7 +610,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr "Подтверждаю"
 
@@ -587,7 +622,7 @@ msgstr "Подтверждаю"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -596,50 +631,71 @@ msgstr ""
 "Действительно абсолютно доверять%%0A  \"%s\"%%0Aкорректно подписанным "
 "сертификатам пользователя?"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "Yes"
 msgstr "Да"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr "Нет"
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr ""
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+
+#: agent/findkey.c:188 agent/findkey.c:195
+#, fuzzy
+msgid "Change passphrase"
+msgstr "сменить фразу-пароль"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr ""
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr ""
 
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr ""
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, c-format
 msgid "error forking process: %s\n"
 msgstr ""
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "ошибка получения кода возврата процесса %d: %s\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "ошибка чтения `%s': статус завершения %d\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr "ошибка запуска `%s': позможно не установлен\n"
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "ошибка чтения `%s': прервано\n"
@@ -678,17 +734,17 @@ msgstr "прервано пользователем\n"
 msgid "problem with the agent\n"
 msgstr "проблема с агентом\n"
 
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "не могу отключить создание файла дампа образа памяти: %s\n"
 
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец %s \"%s\"\n"
 
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа %s \"%s\"\n"
@@ -1433,7 +1489,7 @@ msgstr "использую подклключ %s вместо главного 
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "ключ %s: секретный ключ без открытого ключа - пропущен\n"
 
-#: g10/gpg.c:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1565,7 +1621,7 @@ msgstr "|algo [файлы]|вывести хэши файлов"
 msgid "run in server mode"
 msgstr "запуск в режиме сервера"
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1600,7 +1656,7 @@ msgstr "использовать канонический текстовый р
 msgid "use as output file"
 msgstr "вывод в указанный файл"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "не делать никаких изменений"
 
@@ -2631,12 +2687,12 @@ msgstr "        пропущено новых ключей: %lu\n"
 msgid "          w/o user IDs: %lu\n"
 msgstr "                   без User ID: %lu\n"
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "                 импортировано: %lu"
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  неизмененных: %lu\n"
@@ -2661,22 +2717,22 @@ msgstr "                новых подписей: %lu\n"
 msgid "   new key revocations: %lu\n"
 msgstr "          новых отзывов ключей: %lu\n"
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "    прочитано секретных ключей: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "импортировано секретных ключей: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " неизмененных секретных ключей: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              не импортировано: %lu\n"
@@ -3786,12 +3842,12 @@ msgstr ""
 "пока программа не будет перезапущена.\n"
 
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "отозван"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "просрочен с"
 
@@ -3850,7 +3906,7 @@ msgstr "Удалено %d подписи.\n"
 msgid "Nothing deleted.\n"
 msgstr "Ничего не удалено.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "недопустимый"
 
@@ -4991,7 +5047,7 @@ msgstr "двоичный"
 msgid "textmode"
 msgstr "текстовый"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 msgid "unknown"
 msgstr "неизвестно"
 
@@ -5057,66 +5113,66 @@ msgstr "ВНИМАНИЕ: используется эксперименталь
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ВНИМАНИЕ: хеш-функция %s считается устаревшей\n"
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "модуль поддержки шифра IDEA не обнаружен\n"
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "для дополнительной информации см. %s\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: не рекомендуемая опция \"%s\"\n"
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ВНИМАНИЕ: \"%s\" не рекомендуемая опция\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "используйте \"%s%s\" взамен\n"
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "ВНИМАНИЕ: команда \"%s\" является устаревшей - не следует применять ее\n"
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "ВНИМАНИЕ: \"%s\" не рекомендуемая опция\n"
 
-#: g10/misc.c:737
+#: g10/misc.c:739
 msgid "Uncompressed"
 msgstr "Без сжатия"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "данное сообщение может быть не пригодно для %s\n"
 
-#: g10/misc.c:1047
+#: g10/misc.c:1049
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "двусмысленный параметр `%s'\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "неизвестный параметр `%s'\n"
@@ -5943,7 +5999,7 @@ msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "это созданный PGP ElGamal ключ, не обеспечивающий безопасность подписи!"
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "запись о доверии %lu, тип %d: ошибка записи: %s\n"
@@ -5988,7 +6044,7 @@ msgstr "ошибка при поиске записи о доверии в `%s':
 msgid "read error in `%s': %s\n"
 msgstr "ошибка чтения в `%s': %s\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
@@ -6131,157 +6187,157 @@ msgstr "не могу обработать строки текста длинн
 msgid "input line longer than %d characters\n"
 msgstr "строка ввода длиннее %d символов\n"
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' не является допустимым длинным ID ключа\n"
 
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "ключ %s: принят как доверяемый ключ\n"
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "ключ %s встречается более одного раза в таблице доверий\n"
 
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "ключ %s: нет открытого ключа для доверяемого ключа - пропущен\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "ключ %s помечен как абсолютно доверяемый.\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "запись о доверии %lu, тип запроса %d: сбой чтения: %s\n"
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "запись о доверии %lu не запрашиваемого типа %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "не могу использовать неизвестную модель (%d) - использую %s модель доверий\n"
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr "использую %s модель доверий\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 msgid "[ revoked]"
 msgstr "[ отозван]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 msgid "[ expired]"
 msgstr "[просрочн]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 msgid "[ unknown]"
 msgstr "[неизвстн]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr "[неопредл]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr "[ограничн]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr "[ полное ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr "[абсолютн]"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr "неопределено"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 msgid "never"
 msgstr "никогда"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr "ограниченно"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr "полное"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr "абсолютное"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr "нет необходимости в проверке таблицы доверий\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "срок следующей проверки таблицы доверий %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "нет необходимости проверять таблицу доверий при `%s' модели доверий\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "нет необходимости обновлять таблицу доверий при '%s' модели доверий\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "открытый ключ %s не найден: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr "выполните --check-trustdb, пожалуйста\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 msgid "checking the trustdb\n"
 msgstr "проверка таблицы доверий\n"
 
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d ключей обработано (%d действующих записей очищено)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 msgid "no ultimately trusted keys found\n"
 msgstr "не найдено абсолютно доверяемых ключей\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "открытый ключ для абсолютно доверяемого ключа %s не найден\n"
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d ограниченных необходимо, %d выполненных необходимо, %s модель доверия\n"
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6289,7 +6345,7 @@ msgstr ""
 "глубина: %d  корректных: %3d  подписанных: %3d  доверия: %d-, %dq, %dn, %dm, "
 "%df, %du\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6340,23 +6396,23 @@ msgstr ""
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "сбой преобразования `%s' в `%s': %s\n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 msgid "Please report bugs to "
 msgstr "О найденных ошибка сообщайте "
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Использование: kbxutil [параметры] [файлы] (-h для подсказки)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -6827,7 +6883,7 @@ msgstr "корневой сертификат не помечен доверяе
 msgid "checking the trust list failed: %s\n"
 msgstr "сбой проверки списка доверий: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr "цепочка сертификации слишком длинная\n"
 
@@ -7036,16 +7092,6 @@ msgstr "удаление сертификата \"%s\" неудачно: %s\n"
 msgid "no valid recipients given\n"
 msgstr "не заданы получатели\n"
 
-#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "ошибка создания временного файла: %s\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "ошибка записи во временный файл: %s\n"
-
 #: sm/gpgsm.c:244
 msgid "|[FILE]|make a signature"
 msgstr "|[файл]|создать подпись"
@@ -7174,7 +7220,7 @@ msgstr "добавить данную таблицу ключей в списо
 msgid "add this secret keyring to the list"
 msgstr "добавить данную таблицу секретных ключей в список"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|использовать NAME как секретный ключ по умолчанию"
 
@@ -7253,25 +7299,25 @@ msgstr "невозможно подписать используя `%s': %s\n"
 msgid "this command has not yet been implemented\n"
 msgstr "данная команды всё еще не реализована\n"
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, c-format
 msgid "total number processed: %lu\n"
 msgstr "всего обработано: %lu\n"
 
-#: sm/import.c:226
+#: sm/import.c:227
 msgid "error storing certificate\n"
 msgstr "ошибка сохранения сертификата\n"
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr "ошибка базовой проверки сертификата - не импортирован\n"
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "ошибка импортирования сертификата: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "ошибка чтения ввода: %s\n"
@@ -7480,27 +7526,27 @@ msgstr "ошибка отправки %s команды: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "ошибка отправки стандартных параметров: %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr "Параметры контролирующие вывод диагностики"
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr "Параметры контролирующие конфигурацию"
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 msgid "Options useful for debugging"
 msgstr "Параметры полезные для отладки"
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|сохранять журнал режима сервера в FILE"
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr "Параметры контролирующие безопасность"
 
@@ -7518,56 +7564,82 @@ msgstr "|N|кеш PIN просрочен после N секунд"
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:521
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: tools/gpgconf-comp.c:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:533
+#, fuzzy
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|кеш PIN просрочен после N секунд"
+
+#: tools/gpgconf-comp.c:537
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "разрешить предустановленную фразу-пароль"
+
+#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|зашифровать для получателя NAME"
 
-#: tools/gpgconf-comp.c:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr "Конфигурация серверов ключей"
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr "не проверять CRLd для корневых сертификатов"
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr "Параметры контрролирующие формат вывода"
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr "Настройки HTTP серверов"
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr "использовать системные настройки HTTP проки"
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr "Настройки LDAP серверов"
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr "Настройки OCSP"
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/sk.po b/po/sk.po
index 3bfe27af4..6378cfe79 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-08-16 11:04+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\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"
@@ -18,54 +18,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: agent/call-pinentry.c:436
+#: agent/call-pinentry.c:438
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:439
+#: agent/call-pinentry.c:441
 #, 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:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 #, fuzzy
 msgid "PIN too long"
 msgstr "riadok je pr�li� dlh�\n"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "heslo je pr�li� dlh�\n"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Neplatn� znak ve mene\n"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Bad PIN"
 msgstr "nespr�vne MPI"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "nespr�vne heslo"
 
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 #, fuzzy
 msgid "Passphrase"
 msgstr "nespr�vne heslo"
@@ -160,7 +160,28 @@ msgstr "heslo nie je zopakovan
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "chyba pri vytv�ran� hesla: %s\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "zapisujem do '%s'\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Vlo�i� heslo\n"
+
+#: agent/genkey.c:165
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Pou�i� napriek tomu tento k���? "
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -171,50 +192,64 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:98
-#, fuzzy
-msgid "Take this one anyway"
-msgstr "Pou�i� napriek tomu tento k���? "
+#: agent/genkey.c:202
+#, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] ""
+msgstr[1] ""
 
-#: agent/genkey.c:99 agent/genkey.c:114
-#, fuzzy
-msgid "Enter new passphrase"
-msgstr "Vlo�i� heslo\n"
+#: agent/genkey.c:225
+#, 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 ""
 
-#: agent/genkey.c:107
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+
+#: agent/genkey.c:240
 #, 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:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, 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:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: 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:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: 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:280
+#: agent/genkey.c:412
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "zmeni� heslo"
 
-#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
@@ -225,104 +260,104 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "s dodato�n�mi inform�ciami"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "by� o trochu tich��"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 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:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: 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:129
+#: agent/gpg-agent.c:135
 #, 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:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualizova� datab�zu d�very"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:172
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 tools/symcryptrun.c:204
 #, fuzzy
@@ -331,142 +366,142 @@ 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:260
+#: agent/gpg-agent.c:276
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: agent/gpg-agent.c:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, 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:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nem��em vytvori� adres�r `%s': %s\n"
 
-#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 #, 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:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "chyba pri posielan� na `%s': %s\n"
 
-#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: adres�r vytvoren�\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, 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:1381
+#: agent/gpg-agent.c:1438
 #, 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:1492
+#: agent/gpg-agent.c:1549
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1554
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1571
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1519
+#: agent/gpg-agent.c:1576
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, 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:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: presko�en�: %s\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "zl� form�t premennej prostredia GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -494,40 +529,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 #, 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:1190
+#: agent/protect-tool.c:1213
 #, 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:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 #, 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:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "nespr�vne heslo"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Zru�i�"
@@ -579,8 +614,8 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -590,7 +625,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr ""
 
@@ -602,58 +637,79 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 #, fuzzy
 msgid "Yes"
 msgstr "ano"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr ""
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+
+#: agent/findkey.c:188 agent/findkey.c:195
+#, fuzzy
+msgid "Change passphrase"
+msgstr "zmeni� heslo"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr ""
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nemo�no otvori� s�bor: %s\n"
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
@@ -696,17 +752,17 @@ msgstr "zru
 msgid "problem with the agent\n"
 msgstr "probl�m s agentom: agent vracia 0x%lx\n"
 
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nem��em vypn�� vytv�ranie core s�borov: %s\n"
 
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
@@ -1495,7 +1551,7 @@ msgstr "pou
 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:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1628,7 +1684,7 @@ msgstr "|algo [s
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1667,7 +1723,7 @@ msgstr "pou
 msgid "use as output file"
 msgstr "pou�i� ako v�stupn� s�bor"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "nevykona� �iadne zmeny"
 
@@ -2708,12 +2764,12 @@ msgstr "      presko
 msgid "          w/o user IDs: %lu\n"
 msgstr "        bez identifik�torov: %lu\n"
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "                importovan�: %lu"
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  bez zmien: %lu\n"
@@ -2738,22 +2794,22 @@ msgstr "               nov
 msgid "   new key revocations: %lu\n"
 msgstr "      nov� revok�cie k���ov: %lu\n"
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      pre��tan� tajn� k���e: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "    importovan� tajn� k���e: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      tajn� k���e nezmenen�: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "           neimportovan�: %lu\n"
@@ -3933,13 +3989,13 @@ msgstr ""
 "by� spr�vne, pokia� znovu nespust�te program.\n"
 
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[revokovan�]"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -3999,7 +4055,7 @@ msgstr "Zmazan
 msgid "Nothing deleted.\n"
 msgstr "Ni� nebolo zmaznan�.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "neplatn� sp�sob reprezent�cie v ASCII"
@@ -5178,7 +5234,7 @@ msgstr "bin
 msgid "textmode"
 msgstr "textov� m�d"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 msgid "unknown"
 msgstr "nezn�me"
 
@@ -5240,66 +5296,66 @@ msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA modul pre GnuPG nen�jden�\n"
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = pros�m o viac inform�c�i\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "pou�ite namiesto neho \"%s%s\" \n"
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:737
+#: g10/misc.c:739
 msgid "Uncompressed"
 msgstr "Nekomprimovan�"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Nekomprimovan�"
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, 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:1047
+#: g10/misc.c:1049
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
@@ -6146,7 +6202,7 @@ msgstr ""
 "presko�en� `%s': toto je vygenerovan� PGP k��� pod�a algoritmu ElGamal,\n"
 "podpisy vytvoren� t�mto k���om nie s� bezpe�n�!\n"
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "z�znam d�very %lu, typ %d: z�pis zlyhal: %s\n"
@@ -6196,7 +6252,7 @@ msgstr "chyba pri h
 msgid "read error in `%s': %s\n"
 msgstr "chyba pri ��tan�: %s\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "datab�za d�very: synchroniz�cia zlyhala %s\n"
@@ -6339,166 +6395,166 @@ msgstr "nem
 msgid "input line longer than %d characters\n"
 msgstr "vstupn� riadok je dlh�� ako %d znakov\n"
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' nie je platn� dlh� keyID\n"
 
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "k��� %08lX: akceptovan� ako d�veryhodn� k���\n"
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "k��� %08lX sa v datab�ze d�very vyskytuje viac ako raz\n"
 
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "k��� %08lX: nen�jden� verejn� k��� k d�veryhodn�mu k���u - presko�en�\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "k��� ozna�en� ako absol�tne d�veryhodn�.\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "z�znam d�very %lu, typ po�. %d: ��tanie zlyhalo: %s\n"
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "z�znam d�very %lu nie je po�adovan�ho typu %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revokovan�]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 #, fuzzy
 msgid "[ expired]"
 msgstr "[expirovan�]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 #, fuzzy
 msgid "[ unknown]"
 msgstr "nezn�me"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 #, fuzzy
 msgid "never"
 msgstr "nikdy     "
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dal�ia kontrola datab�zy d�very %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "verejn� k��� %08lX nebol n�jden�: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr "pros�m vykonajte --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 msgid "checking the trustdb\n"
 msgstr "kontrolujem datab�zu d�very\n"
 
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d k���ov spracovan�ch (%d po�tov platnosti vymazan�ch)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 msgid "no ultimately trusted keys found\n"
 msgstr "neboli n�jden� �iadne absol�tne d�veryhodn� k���e\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "verejn� k��� k absol�tne d�veryhodn�mu k���u  %08lX nebol n�jden�\n"
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "z�znam d�very %lu, typ %d: z�pis zlyhal: %s\n"
@@ -6548,27 +6604,27 @@ msgstr "nemo
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 #, 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"
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -7049,7 +7105,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
@@ -7264,16 +7320,6 @@ msgstr "zmazanie bloku k
 msgid "no valid recipients given\n"
 msgstr "(�iadny popis)\n"
 
-#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "chyba pri vytv�ran� hesla: %s\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "zapisujem do '%s'\n"
-
 #: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
@@ -7415,7 +7461,7 @@ msgstr ""
 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:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr "|MENO|pou�i MENO ako implicitn� tajn� k���"
 
@@ -7498,26 +7544,26 @@ msgstr "nem
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "Celkovo spracovan�ch k���ov: %lu\n"
 
-#: sm/import.c:226
+#: sm/import.c:227
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "vytvori� revoka�n� certifik�t"
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
@@ -7731,27 +7777,27 @@ msgstr "chyba pri posielan
 msgid "error sending standard options: %s\n"
 msgstr "chyba pri posielan� na `%s': %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr ""
 
@@ -7767,57 +7813,83 @@ msgstr ""
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:521
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: tools/gpgconf-comp.c:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:533
+#, fuzzy
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|pou�i� m�d hesla N"
+
+#: tools/gpgconf-comp.c:537
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "chyba pri vytv�ran� hesla: %s\n"
+
+#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|MENO|�ifrova� pre MENO"
 
-#: tools/gpgconf-comp.c:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|ALG|pou�i� �ifrovac� algoritmus ALG pre hesl�"
 
-#: tools/gpgconf-comp.c:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8833,9 +8905,6 @@ msgstr "ochrann
 #~ "nastav v�etky vlastnosti paketov, �ifier\n"
 #~ " a hashov ako v PGP 2.x"
 
-#~ msgid "|N|use passphrase mode N"
-#~ msgstr "|N|pou�i� m�d hesla N"
-
 #~ msgid "|NAME|use message digest algorithm NAME for passphrases"
 #~ msgstr "|ALG|pou�i� hashovac� algoritmus ALG pre hesl�"
 
diff --git a/po/sv.po b/po/sv.po
index 347cdb440..ec605c908 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-08-16 11:04+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\n"
 "PO-Revision-Date: 2007-02-17 13:13+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -38,7 +38,7 @@ msgstr ""
 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:436
+#: agent/call-pinentry.c:438
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -46,44 +46,44 @@ msgstr ""
 "Ange din PIN-kod så att den hemliga nyckeln kan låsas upp för den här "
 "sessionen"
 
-#: agent/call-pinentry.c:439
+#: agent/call-pinentry.c:441
 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:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (försök %d av %d)"
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 msgid "PIN too long"
 msgstr "PIN-koden är för lång"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 msgid "Passphrase too long"
 msgstr "Lösenfrasen är för lång"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 msgid "Invalid characters in PIN"
 msgstr "Ogiltiga tecken i PIN-kod"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr "PIN-kod för kort"
 
 # MPI står för Multiple Precision Integer (tror jag)
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 msgid "Bad PIN"
 msgstr "Felaktig PIN-kod"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 msgid "Bad Passphrase"
 msgstr "Felaktig lösenfras"
 
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 msgid "Passphrase"
 msgstr "Lösenfras"
 
@@ -179,7 +179,26 @@ msgstr "PIN-kod repeterades inte korrekt; försök igen"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Ange PIN-koden%s%s%s för att låsa upp kortet"
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "fel när temporärfil skapades: %s\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "fel vid skrivning till temporärfil: %s\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+msgid "Enter new passphrase"
+msgstr "Ange ny lösenfras"
+
+#: agent/genkey.c:165
+msgid "Take this one anyway"
+msgstr "Ta den här ändå"
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -194,46 +213,68 @@ msgstr[1] ""
 "Varning:  Du har angivit en lösenfras som%%0Auppenbart inte är säker.  En "
 "lösenfras ska%%0Avara minst %u tecken lång."
 
-#: agent/genkey.c:98
-msgid "Take this one anyway"
-msgstr "Ta den här ändå"
+#: agent/genkey.c:202
+#, fuzzy, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] ""
+"Varning:  Du har angivit en lösenfras som%%0Auppenbart inte är säker.  En "
+"lösenfras ska%%0Avara minst %u tecken lång."
+msgstr[1] ""
+"Varning:  Du har angivit en lösenfras som%%0Auppenbart inte är säker.  En "
+"lösenfras ska%%0Avara minst %u tecken lång."
 
-#: agent/genkey.c:99 agent/genkey.c:114
-msgid "Enter new passphrase"
-msgstr "Ange ny lösenfras"
+#: agent/genkey.c:225
+#, fuzzy, 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 ""
+"Varning:  Du har angivit en lösenfras som%%0Auppenbart inte är säker.  En "
+"lösenfras ska%%0Avara minst %u tecken lång."
 
-#: agent/genkey.c:107
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+
+#: agent/genkey.c:240
 #, 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:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
 # fel kapitalisering i originalet?
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr "Ange lösenfrasen för%0Aför att skydda din nya nyckel"
 
-#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
 msgid "Please re-enter this passphrase"
 msgstr "Ange denna lösenfras igen"
 
-#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: agent/genkey.c:321 agent/genkey.c:443 agent/protect-tool.c:1225
 #: tools/symcryptrun.c:456
 msgid "does not match - try again"
 msgstr "stämmer inte överens - försök igen"
 
-#: agent/genkey.c:280
+#: agent/genkey.c:412
 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:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 msgid ""
 "@Options:\n"
@@ -242,110 +283,110 @@ msgstr ""
 "@Flaggor:\n"
 " "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr "kör i serverläge (förgrund)"
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr "kör i demonläge (bakgrund)"
 
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "utförlig"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "var något tystare"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr "sh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr "csh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|läs inställningar från FIL"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr "frigör inte från konsollen"
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr "fånga inte tangentbord och mus"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "använd en loggfil för servern"
 
-#: agent/gpg-agent.c:129
+#: agent/gpg-agent.c:135
 msgid "use a standard location for the socket"
 msgstr "använd en standardplats för uttaget"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PRG|använd PRG som PIN-inmatningsprogrammet"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PRG|använd PRG som SCdaemon-programmet"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 msgid "do not use the SCdaemon"
 msgstr "använd inte SCdaemon"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr "ignorera begäran om att ändra TTY"
 
-#: agent/gpg-agent.c:145
+#: 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:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|låt mellanlagrad PIN-koder gå ut efter N sekunder"
 
-#: agent/gpg-agent.c:154
+#: 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:156
+#: 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:158
+#: agent/gpg-agent.c:172
 msgid "allow presetting passphrase"
 msgstr "tillåt förinställning av lösenfras"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr "aktivera ssh-agent-emulering"
 
-#: agent/gpg-agent.c:161
+#: 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:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 tools/symcryptrun.c:204
 msgid "Please report bugs to <"
 msgstr "Rapportera fel till <"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:276
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Användning: gpg-agent [flaggor] (-h för hjälp)"
 
-#: agent/gpg-agent.c:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -353,130 +394,130 @@ msgstr ""
 "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
 "Hantering av hemliga nycklar för GnuPG\n"
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ogiltig debug-level \"%s\" angiven\n"
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, fuzzy, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "libksba är för gammal (behöver %s, har %s)\n"
 
-#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBS: inställningsfilen \"%s\" saknas\n"
 
-#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan inte skapa katalog: %s\n"
 
-#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr "namnet på uttaget är för långt\n"
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan inte skapa uttag: %s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "ingen gpg-agent kör i den här sessionen\n"
 
-#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "fel när \"%s\" bands till uttag: %s\n"
 
-#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() misslyckades: %s\n"
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "lyssnar på uttaget \"%s\"\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen \"%s\" skapades\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() misslyckades för \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1381
+#: agent/gpg-agent.c:1438
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "kan inte använda \"%s\" som hemkatalog\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1549
 #, 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:1497
+#: agent/gpg-agent.c:1554
 #, 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:1514
+#: agent/gpg-agent.c:1571
 #, 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:1519
+#: agent/gpg-agent.c:1576
 #, 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:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select misslyckades: %s - väntar 1 s\n"
 
-#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppad\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 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:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
 
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -508,22 +549,22 @@ msgstr ""
 "Syntax: gpg-protect-tool [flaggor] [argument]\n"
 "Underhållsverktyg för hemliga nycklar\n"
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Ange lösenfrasen för att avskydda PKCS#12-objektet."
 
-#: agent/protect-tool.c:1190
+#: agent/protect-tool.c:1213
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Ange lösenfrasen för att skydda det nya PKCS#12-objektet."
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 "Ange lösenfrasen för att skydda det importerade objektet inom GnuPG-systemet."
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -531,16 +572,16 @@ msgstr ""
 "Ange lösenfrasen eller PIN-koden som\n"
 "behövs för att färdigställa denna åtgärd."
 
-#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 msgid "Passphrase:"
 msgstr "Lösenfras:"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "fel vid fråga efter lösenfrasen: %s\n"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 msgid "cancelled\n"
 msgstr "avbruten\n"
 
@@ -591,8 +632,8 @@ msgstr "fel vid inläsning av betrodda rotcertifikat\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -604,7 +645,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr "Korrekt"
 
@@ -616,7 +657,7 @@ msgstr "Korrekt"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -625,51 +666,72 @@ msgstr ""
 "Litar du förbehållslöst på%%0A  \"%s\"%%0Aatt korrekt certifiera "
 "användarcertifikat?"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr "Nej"
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr ""
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+
+#: agent/findkey.c:188 agent/findkey.c:195
+#, fuzzy
+msgid "Change passphrase"
+msgstr "ändra en lösenfras"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr ""
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "fel när ett rör skapades: %s\n"
 
 # se förra kommentaren
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "kan inte fdopen rör för läsning: %s\n"
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "fel vid grening av process: %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "misslyckades med att vänta på att processen %d skulle avslutas: %s\n"
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "fel vid hämtning av avslutskod för processen %d: %s\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr "fel vid körning av \"%s\": antagligen inte installerat\n"
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "fel vid körning av \"%s\": avslutades\n"
@@ -708,18 +770,18 @@ msgstr "avbruten av användaren\n"
 msgid "problem with the agent\n"
 msgstr "problem med agenten\n"
 
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan inte stänga av minnesutskrifter: %s\n"
 
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Varning: osäkert ägarskap på %s \"%s\"\n"
 
 # Extension är vad? FIXME
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Varning: osäkra rättigheter på %s \"%s\"\n"
@@ -1478,7 +1540,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:368 kbx/kbxutil.c:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1612,7 +1674,7 @@ 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:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1647,7 +1709,7 @@ msgstr "använd \"ursprunglig text\"-läget"
 msgid "use as output file"
 msgstr "använd som fil för utdata"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
@@ -2716,12 +2778,12 @@ msgstr "        överhoppade nya nycklar: %lu\n"
 msgid "          w/o user IDs: %lu\n"
 msgstr "       utan användaridentiteter: %lu\n"
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "                    importerade: %lu"
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                    oförändrade: %lu\n"
@@ -2746,22 +2808,22 @@ msgstr "                 nya signaturer: %lu\n"
 msgid "   new key revocations: %lu\n"
 msgstr "          nya nyckelspärrningar: %lu\n"
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "    antal lästa hemliga nycklar: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "    importerade hemliga nycklar: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    oförändrade hemliga nycklar: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "               inte importerade: %lu\n"
@@ -3895,12 +3957,12 @@ msgstr ""
 "såvida inte du startar om programmet.\n"
 
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "spärrad"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "utgånget"
 
@@ -3961,7 +4023,7 @@ msgstr "Raderade %d signaturer.\n"
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "ogiltigt"
 
@@ -5137,7 +5199,7 @@ msgstr "binär"
 msgid "textmode"
 msgstr "textläge"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 msgid "unknown"
 msgstr "okänd"
 
@@ -5200,65 +5262,65 @@ msgstr "VARNING: använder experimentella sammandragsalgoritmen %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "VARNING: sammandragsalgoritmen %s är föråldrad\n"
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "insticksmodul för IDEA-kryptering är inte installerat\n"
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "se %s för mer information\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: flaggan är föråldrad \"%s\"\n"
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Använd \"%s%s\" istället\n"
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VARNING: \"%s\" är ett föråldrat kommando - använd det inte\n"
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: föråldrad flagga \"%s\" - den har ingen effekt\n"
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "VARNING: \"%s\" är en föråldrad flagga - den har ingen effekt\n"
 
-#: g10/misc.c:737
+#: g10/misc.c:739
 msgid "Uncompressed"
 msgstr "Okomprimerad"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 msgid "uncompressed|none"
 msgstr "okomprimerad|ingen"
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "detta meddelande kanske inte kan användas av %s\n"
 
-#: g10/misc.c:1047
+#: g10/misc.c:1049
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "tvetydlig flagga \"%s\"\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "okänd flagga \"%s\"\n"
@@ -6121,7 +6183,7 @@ msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "det här är en PGP-genererad Elgamal-nyckel som inte är säker för signaturer!"
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n"
@@ -6166,7 +6228,7 @@ msgstr "fel vid sökning av tillitsvärde i \"%s\": %s\n"
 msgid "read error in `%s': %s\n"
 msgstr "läsfel i \"%s\":  %s\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
@@ -6310,52 +6372,52 @@ msgstr "kan inte hantera text med rader längre än %d tecken\n"
 msgid "input line longer than %d characters\n"
 msgstr "indataraden är längre än %d tecken\n"
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "\"%s\" är inget giltigt långt nyckel-id\n"
 
 # trusted??
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "nyckel %s: accepterad som betrodd nyckel\n"
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "nyckeln %s förekommer fler än en gång i tillitsdatabasen\n"
 
 # nyckeln?
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "nyckel %s: ingen publik nyckel för pålitlig nyckel - hoppades över\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "nyckeln %s är markerad med förbehållslöst förtroende\n"
 
 # req står för request
 # kollat med Werner. Per
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "tillitspost %lu, begäran av typ %d: kunde inte läsa: %s\n"
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "tillitsvärdet %lu är inte av begärd typ %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "kunde inte använda okänd tillitsmodell (%d) - antar tillitsmodellen %s\n"
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr "använder tillitsmodellen %s\n"
@@ -6369,121 +6431,121 @@ msgstr "använder tillitsmodellen %s\n"
 #    It gets passed to atoi() so everything after the number is
 #    essentially a comment and need not be translated.  Either key and
 #    uid are both NULL, or neither are NULL. */
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "15"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 msgid "[ revoked]"
 msgstr "[   spärrad   ]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 msgid "[ expired]"
 msgstr "[   utgånget  ]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 msgid "[ unknown]"
 msgstr "[    okänt    ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr "[ odefinierad ]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr "[  marginell  ]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr "[ fullständig ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr "[förbehållslös]"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr "odefinierad"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 msgid "never"
 msgstr "aldrig"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr "marginell"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr "fullständig"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr "förbehållslös"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nästa kontroll av tillitsdatabasen kommer att äga rum %s\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 "det behövs ingen kontroll av tillitsdatabasen med tillitsmodellen \"%s\"\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 "det behövs ingen uppdatering av tillitsdatabasen med tillitsmodellen \"%s\"\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "publika nyckeln %s hittades inte: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr "gör en kontroll av tillitsdatabasen --check-trustdb\n"
 
 # originalet borde ha ett value
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 msgid "checking the trustdb\n"
 msgstr "kontrollerar  tillitsdatabasen\n"
 
 # Vad är detta!?
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d nycklar behandlade (%d validity counts rensade)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 msgid "no ultimately trusted keys found\n"
 msgstr "hittade inga nycklar med förbehållslöst förtroende\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "publik nyckel för förbehållslöst betrodda nyckeln %s hittades inte\n"
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d marginal(er) behövs, %d fullständig(a) behövs, tillitsmodell %s\n"
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "djup: %d  giltig: %3d  signerad: %3d  tillit: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6535,23 +6597,23 @@ msgstr "iconv_open misslyckades: %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "konvertering från \"%s\" till \"%s\" misslyckades: %s\n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr "ställ in felsökningsflaggor"
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr "aktivera fullständigt felsökningsläge"
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 msgid "Please report bugs to "
 msgstr "Rapportera fel till "
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Användning: kbxutil [flaggor] [filer] (-h för hjälp)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -7022,7 +7084,7 @@ msgstr "rotcertifikatet har inte markerats som betrott"
 msgid "checking the trust list failed: %s\n"
 msgstr "kontroll mot tillitslistan misslyckades: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr "certifikatkedjan är för lång\n"
 
@@ -7233,16 +7295,6 @@ msgstr "borttagning av certifikatet \"%s\" misslyckades: %s\n"
 msgid "no valid recipients given\n"
 msgstr "inga giltiga mottagare angavs\n"
 
-#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "fel när temporärfil skapades: %s\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "fel vid skrivning till temporärfil: %s\n"
-
 #: sm/gpgsm.c:244
 msgid "|[FILE]|make a signature"
 msgstr "|[FIL]|skapa en signatur"
@@ -7371,7 +7423,7 @@ msgstr "lägg till denna nyckelring till listan över nyckelringar"
 msgid "add this secret keyring to the list"
 msgstr "lägg till denna hemliga nyckelring till listan"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
 
@@ -7450,25 +7502,25 @@ msgstr "kan inte signera med \"%s\": %s\n"
 msgid "this command has not yet been implemented\n"
 msgstr "det här kommandot har ännu inte implementerats\n"
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, c-format
 msgid "total number processed: %lu\n"
 msgstr "totalt antal behandlade: %lu\n"
 
-#: sm/import.c:226
+#: sm/import.c:227
 msgid "error storing certificate\n"
 msgstr "fel vid lagring av certifikat\n"
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr "enkla certifikatkontroller misslyckades - importeras inte\n"
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "fel vid import av certifikat: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "fel vid läsning av indata: %s\n"
@@ -7687,27 +7739,27 @@ msgstr "fel vid sändning av %s-kommando: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "fel vid sändning av standardflaggor: %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr "Flaggor som kontrollerar diagnosutdata"
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr "Flaggor som kontrollerar konfigurationen"
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 msgid "Options useful for debugging"
 msgstr "Flaggor användbara för felsökning"
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FIL|skriv serverlägesloggar till FIL"
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr "Flaggor som kontrollerar säkerheten"
 
@@ -7725,56 +7777,82 @@ msgstr "|N|låt mellanlagrad PIN-koder gå ut efter N sekunder"
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:521
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: tools/gpgconf-comp.c:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:533
+#, fuzzy
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|låt mellanlagrad PIN-koder gå ut efter N sekunder"
+
+#: tools/gpgconf-comp.c:537
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "tillåt förinställning av lösenfras"
+
+#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAMN|kryptera för NAMN"
 
-#: tools/gpgconf-comp.c:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr "Konfiguration för nyckelservrar"
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr "kontrollera inte spärrlistor för rotcertifikat"
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr "Flaggor som kontrollerar formatet på utdata"
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr "Flaggor som kontrollerar interaktivitet och framtvingande"
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr "Konfiguration för HTTP-servrar"
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr "använd systemets HTTP-proxyinställningar"
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr "Konfiguration av LDAP-servrar som ska användas"
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr "Konfiguration för OCSP"
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index 81eb42121..efe65c33a 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-08-16 11:04+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\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"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "PIN giriş kilidi edinilemedi: %s\n"
 
-#: agent/call-pinentry.c:436
+#: agent/call-pinentry.c:438
 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:439
+#: agent/call-pinentry.c:441
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -36,36 +36,36 @@ msgstr ""
 "Lütfen anahtar parolanızı giriniz, böylelikle bu oturumda bu gizli anahtar "
 "kilitsiz olabilecek"
 
-#: agent/call-pinentry.c:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 msgid "PIN too long"
 msgstr "PIN çok uzun"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 msgid "Passphrase too long"
 msgstr "Anahtar Parolası çok uzun"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 msgid "Invalid characters in PIN"
 msgstr "PIN içinde geçersiz karakterler var"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr "PIN çok kısa"
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 msgid "Bad PIN"
 msgstr "PIN hatalı"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 msgid "Bad Passphrase"
 msgstr "Anahtar Parolası hatalı"
 
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 msgid "Passphrase"
 msgstr "Anahtar Parolası"
 
@@ -159,7 +159,28 @@ msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Kartın kilidini açmak için lütfen PIN%s%s%s giriniz"
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "geçici dosya oluşturulurken hata: %s\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "geçeci dosyaya yazma hatası: %s\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Anahtar parolasını giriniz\n"
+
+#: agent/genkey.c:165
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Bu anahtar yine de kullanılsın mı? (e/H ya da y/N) "
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -170,46 +191,60 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:98
-#, fuzzy
-msgid "Take this one anyway"
-msgstr "Bu anahtar yine de kullanılsın mı? (e/H ya da y/N) "
+#: agent/genkey.c:202
+#, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] ""
+msgstr[1] ""
 
-#: agent/genkey.c:99 agent/genkey.c:114
-#, fuzzy
-msgid "Enter new passphrase"
-msgstr "Anahtar parolasını giriniz\n"
+#: agent/genkey.c:225
+#, 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 ""
 
-#: agent/genkey.c:107
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+
+#: agent/genkey.c:240
 #, 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:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, 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:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: 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:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: 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:280
+#: agent/genkey.c:412
 msgid "Please enter the new passphrase"
 msgstr "Lütfen yeni anahtar parolasını girin"
 
-#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 msgid ""
 "@Options:\n"
@@ -218,109 +253,109 @@ msgstr ""
 "@Seçenekler:\n"
 " "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr "sunucu olarak (önalanda) çalışır"
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr "artalan süreci olarak çalışır"
 
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "ayrıntılı"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "biraz daha sessiz olur"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr "sh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr "csh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|DOSYA|seçenekler DOSYAdan okunur"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr "konsoldan kopulmaz"
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr "klavye ve fare gaspedilmez"
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: 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:129
+#: agent/gpg-agent.c:135
 msgid "use a standard location for the socket"
 msgstr "soket için standart bir yer kullanılır"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|UYG|PIN girme uygulaması olarak UYG kullanılır"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "[UYG|Akıllı kart uygulaması olarak UYG kullanılır"
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 msgid "do not use the SCdaemon"
 msgstr "Akıllı kart süreci kullanılmaz"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr "TTY değiştirme istekleri yoksayılır"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr "X birimi değiştirme istekleri yoksayılır"
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr "imzalarken PIN arabelleği kullanılmaz"
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "istemcilerin anahtarları \"güvenilir\" olarak imlemesine izin verilir"
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:172
 msgid "allow presetting passphrase"
 msgstr "anahtar parolasının önceden atanmasına izin verilir"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr "ssh-agent öykünümü etkinleşir"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|DOSYA|ortam ayarlarını ayrıca DOSYAya da yazar"
 
-#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 tools/symcryptrun.c:204
 msgid "Please report bugs to <"
 msgstr "Yazılım hatalarını lütfen <"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:276
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] (yardım için -h)"
 
-#: agent/gpg-agent.c:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -328,130 +363,130 @@ msgstr ""
 "Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
 "GnuPG için gizli anahtar yönetimi\n"
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, 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:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, 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:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "`%s' dizini oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr "soketin ismi çok uzun\n"
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "soket oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 #, 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:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "soket `%s'e bağlanırken hata: %s\n"
 
-#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "soket dinleme başarısız: %s\n"
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "`%s' soketi dinlemede\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "dizin `%s' oluşturuldu\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, 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:1381
+#: agent/gpg-agent.c:1438
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "`%s' ev dizini olarak kullanılamıyor\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1549
 #, 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:1497
+#: agent/gpg-agent.c:1554
 #, 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:1514
+#: agent/gpg-agent.c:1571
 #, 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:1519
+#: agent/gpg-agent.c:1576
 #, 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:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, 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:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s durdu\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 msgid "no gpg-agent running in this session\n"
 msgstr "bu oturumda çalışan gpg-agent yok\n"
 
-#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
 
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -482,16 +517,16 @@ msgstr ""
 "Sözdizimi: gpg-protect-tool [seçenekler] [arg ...]\n"
 "Gizli anahtar bakım aracı\n"
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 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:1190
+#: agent/protect-tool.c:1213
 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:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -499,7 +534,7 @@ msgstr ""
 "Lütfen GnuPG sistemine ithal edilen nesneyi koruyacak anahtar parolasını "
 "giriniz."
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -507,16 +542,16 @@ msgstr ""
 "Lütfen bu işlemi tamamlamak için gereken\n"
 "PIN'i veya anahtar parolasını giriniz."
 
-#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 msgid "Passphrase:"
 msgstr "Anahtar Parolası:"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "anahtar parolası sorulurken hata: %s\n"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 msgid "cancelled\n"
 msgstr "iptal edildi\n"
 
@@ -567,8 +602,8 @@ msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -580,7 +615,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr "Doğru"
 
@@ -592,7 +627,7 @@ msgstr "Doğru"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -601,50 +636,71 @@ msgstr ""
 "Kullanıcı sertifikalarının%%0A  \"%s\"%%0Aile doğru olarak onaylanacağından "
 "son derece emin misiniz?"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "Yes"
 msgstr "Evet"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr "Hayır"
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr ""
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+
+#: agent/findkey.c:188 agent/findkey.c:195
+#, fuzzy
+msgid "Change passphrase"
+msgstr "anahtar parolası değiştirir"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr ""
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "boru oluşturulurken hata: %s\n"
 
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "okumak için boruya fdopen yapılamadı: %s\n"
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "süreç çatallanırken hata: %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "süreç %d çıkış kodu alınırken hata: %s\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr "`%s' çalıştırılırken hata: muhtemelen kurulu değil\n"
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "`%s' çalışırken hata: sonlandırıldı\n"
@@ -683,17 +739,17 @@ msgstr "kullanıcı tarafından iptal edildi\n"
 msgid "problem with the agent\n"
 msgstr "aracı ile sorun var\n"
 
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "\"core\" oluşumu iptal edilemedi: %s\n"
 
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "UYARI: %s üzerinde sahiplik güvensiz: \"%s\"\n"
 
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "UYARI: %s üzerinde izinler güvensiz: \"%s\"\n"
@@ -1443,7 +1499,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:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1575,7 +1631,7 @@ msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
 msgid "run in server mode"
 msgstr "sunucu kipinde çalışır"
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1610,7 +1666,7 @@ msgstr "kurallı metin kipini kullanır"
 msgid "use as output file"
 msgstr "çıktı dosyası olarak kullanılır"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
@@ -2630,12 +2686,12 @@ msgstr "     yeni anahtarlar atlandı: %lu\n"
 msgid "          w/o user IDs: %lu\n"
 msgstr "         kullanıcı kimliksiz: %lu\n"
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      alınan: %lu"
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   değişmedi: %lu\n"
@@ -2660,22 +2716,22 @@ msgstr "                yeni imzalar: %lu\n"
 msgid "   new key revocations: %lu\n"
 msgstr "      yeni anahtar iptalleri: %lu\n"
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     gizli anahtarlar okundu: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  gizli anahtarlar indirildi: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "  gizli anahtarlar değişmedi: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             alınamadı: %lu\n"
@@ -3829,12 +3885,12 @@ msgstr ""
 "doğrulukta olmayacağını lütfen gözönüne alınız.\n"
 
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "yürürlükten kaldırıldı"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "zamanaşımına uğradı"
 
@@ -3894,7 +3950,7 @@ msgstr "%d imza silindi.\n"
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "geçersiz"
 
@@ -5064,7 +5120,7 @@ msgstr "ikili"
 msgid "textmode"
 msgstr "metinkipi"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 msgid "unknown"
 msgstr "bilinmeyen"
 
@@ -5125,65 +5181,65 @@ msgstr "UYARI: deneysel %s özümleme algoritması kullanılıyor\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "UYARI: %s özümleme algoritması artık önerilmiyor.\n"
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA şifre eklentisi yok\n"
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "daha fazla bilgi için lütfen %s adresine bakınız\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: \"%s\" seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "lütfen yerine \"%s%s\" kullanınız\n"
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "UYARI: \"%s\" komutu artık önerilmiyor - kullanmayın onu\n"
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:737
+#: g10/misc.c:739
 msgid "Uncompressed"
 msgstr "Sıkıştırılmamış"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 msgid "uncompressed|none"
 msgstr "Sıkıştırılmamış|yok"
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "bu ileti %s tarafından kullanılamayabilir\n"
 
-#: g10/misc.c:1047
+#: g10/misc.c:1049
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "`%s' seçeneği belirsiz\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "`%s' seçeneği bilinmiyor\n"
@@ -6023,7 +6079,7 @@ msgstr "atlandı: gizli anahtar zaten var\n"
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "bu, imzalar için güvenli olmayan PGP üretimi bir ElGamal anahtarı!"
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "güvence veritabanının %lu. kaydı, %d türünde: yazma başarısız: %s\n"
@@ -6068,7 +6124,7 @@ msgstr "`%s' deki güvence kaydını ararken hata: %s\n"
 msgid "read error in `%s': %s\n"
 msgstr "`%s' için okuma hatası: %s\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "güvence veritabanı: eşzamanlama başarısız: %s\n"
@@ -6212,157 +6268,157 @@ msgstr "%d karakterden daha uzun metin satırları okunamıyor\n"
 msgid "input line longer than %d characters\n"
 msgstr "girdi satırı %d karakterden daha uzun\n"
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' geçerli bir anahtar kimliği değil\n"
 
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "anahtar %s: güvenli anahtar olarak kabul edildi\n"
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "anahtar %s güvence veritabanında birden fazla görünüyor\n"
 
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "anahtar %s: güvenli anahtar için genel anahtar yok - atlandı\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "anahtar %s son derece güvenli olarak imlendi.\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "güvence veritabanı kaydı %lu, istek tipi %d: okuma başarısız: %s\n"
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "güvence veritabanının %lu. kaydı %d istek türünde değil\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "bilinmeyen güvence modeli (%d) kullanılamıyor - %s güvence modeli "
 "varsayılıyor\n"
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr "%s güvence modeli kullanılıyor\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "20 translator seen trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 msgid "[ revoked]"
 msgstr "[yürürlükten kalktı]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 msgid "[ expired]"
 msgstr "[  süresi  doldu  ]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 msgid "[ unknown]"
 msgstr "[    bilinmeyen   ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr "[     tanımsız    ]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr "[   şöyle böyle   ]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr "[     tamamen     ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr "[   son  derece   ]"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr "tanımsız"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 msgid "never"
 msgstr "asla    "
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr "şöyle böyle"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr "tamamen"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr "son derece"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr "bir güvence veritabanı denetimi gereksiz\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sonraki güvence veritabanı denetimi %s de\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "`%s' güvence modelli güvence veritabanı sınaması için gereksiz\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "`%s' güvence modelli güvence veritabanı güncellemesi için gereksiz\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "genel anahtar %s yok: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr "lütfen bir --check-trustdb yapın\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 msgid "checking the trustdb\n"
 msgstr "güvence veritabanı denetleniyor\n"
 
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d anahtar işlendi (%d doğrulama temizlendi)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 msgid "no ultimately trusted keys found\n"
 msgstr "son derece güvenli bir anahtar yok\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "son derece güvenli %s için genel anahtar yok\n"
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d şöyle böyle gerekli, %d tamamen gerekli, %s güvence modeli\n"
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6370,7 +6426,7 @@ msgstr ""
 "derinlik: %d  geçerli: %3d  imzalı: %3d  güvenilir: %d-, %dq, %dn, %dm, %df, "
 "%du\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6421,23 +6477,23 @@ msgstr "iconv_open başarısız: %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "`%s' > `%s' dönüşümü başarısız: %s\n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr "hata ayıklama bayrakları ayarlanır"
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr "tam hata ayıklama etkin olur"
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 msgid "Please report bugs to "
 msgstr "Yazılım hatalarını lütfen "
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Kullanımı: kbxutil [seçenekler] [dosyalar] (yardım için -h)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -6909,7 +6965,7 @@ msgstr "kök sertifika güvenilir olarak imli değil"
 msgid "checking the trust list failed: %s\n"
 msgstr "güvence listesinin sınanması başarısız: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr "sertifika zinciri çok uzun\n"
 
@@ -7118,16 +7174,6 @@ msgstr "\"%s\" sertifikası silinemedi: %s\n"
 msgid "no valid recipients given\n"
 msgstr "geçerli alıcılar verilmedi\n"
 
-#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "geçici dosya oluşturulurken hata: %s\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "geçeci dosyaya yazma hatası: %s\n"
-
 #: sm/gpgsm.c:244
 msgid "|[FILE]|make a signature"
 msgstr "|[DOSYA]|bir imza yapar"
@@ -7256,7 +7302,7 @@ msgstr "bu anahtarlığı anahtarlık listesine ekler"
 msgid "add this secret keyring to the list"
 msgstr "bu gizli anahtarlığı listeye ekler"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
 
@@ -7334,25 +7380,25 @@ msgstr "`%s' kullanarak imzalanamıyor: %s\n"
 msgid "this command has not yet been implemented\n"
 msgstr "bu komut henüz gerçeklenmedi\n"
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, c-format
 msgid "total number processed: %lu\n"
 msgstr "işlenmiş toplam miktar: %lu\n"
 
-#: sm/import.c:226
+#: sm/import.c:227
 msgid "error storing certificate\n"
 msgstr "sertifika saklanırken hata\n"
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr "temel sertifika sınamaları başarısız oldu - ithal edilmedi\n"
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "sertifika ithal edilirken hata: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "girdi okunurken hata: %s\n"
@@ -7568,27 +7614,27 @@ msgstr "%s komutu gönderilirken hata: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "standart seçenekler gönderilirken hata: %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr "Tanı çıktısını denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr "Yapılandırmayı denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 msgid "Options useful for debugging"
 msgstr "Hata ayıklamaya elverişli seçenekler"
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr "Güvenliği denetleyen seçenekler"
 
@@ -7606,56 +7652,82 @@ msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:521
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: tools/gpgconf-comp.c:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:533
+#, fuzzy
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
+
+#: tools/gpgconf-comp.c:537
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "anahtar parolasının önceden atanmasına izin verilir"
+
+#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|İSİM|İSİM için şifreleme yapar"
 
-#: tools/gpgconf-comp.c:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr "Anahtar sunucular için yapılandırma"
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr "PKA aramalarına izin verilir (DNS istekleri)"
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr "kök sertifikalar için CRLler sınanmaz"
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr "Çıktı biçimini denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr "Etkileşimliliği ve zorlamayı denetleyen seçenekler"
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr "HTTP sunucuları için yapılandırma"
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr "sistemin HTTP vekil ayarları kullanılır"
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr "Kullanılacak LDAP sunucularının yapılandırması"
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr "OCSP için yapılandırma"
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2f5a89f02..277dcae58 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-08-16 11:04+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\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"
@@ -24,54 +24,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "无法存储指纹：%s\n"
 
-#: agent/call-pinentry.c:436
+#: agent/call-pinentry.c:438
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:439
+#: agent/call-pinentry.c:441
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/call-pinentry.c:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 #, fuzzy
 msgid "PIN too long"
 msgstr "列太长"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "列太长"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "姓名含有无效的字符\n"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Bad PIN"
 msgstr "损坏的多精度整数(MPI)"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "错误的密码"
 
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 #, fuzzy
 msgid "Passphrase"
 msgstr "错误的密码"
@@ -166,7 +166,28 @@ msgstr "PIN 再次输入时与首次输入不符；请再试一次"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "生成密码的时候发生错误：%s\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "%s：写入目录记录时出错：%s\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "请输入密码\n"
+
+#: agent/genkey.c:165
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "无论如何还是使用这把密钥吗？(y/N)"
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -177,50 +198,64 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:98
-#, fuzzy
-msgid "Take this one anyway"
-msgstr "无论如何还是使用这把密钥吗？(y/N)"
+#: agent/genkey.c:202
+#, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] ""
+msgstr[1] ""
 
-#: agent/genkey.c:99 agent/genkey.c:114
-#, fuzzy
-msgid "Enter new passphrase"
-msgstr "请输入密码\n"
+#: agent/genkey.c:225
+#, 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 ""
 
-#: agent/genkey.c:107
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+
+#: agent/genkey.c:240
 #, 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:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "更改密码"
 
-#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: 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:280
+#: agent/genkey.c:412
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "更改密码"
 
-#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
@@ -231,104 +266,104 @@ msgstr ""
 "选项：\n"
 " "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "详细模式"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "尽量减少提示信息"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "从‘%s’读取选项\n"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "在公钥服务器上搜寻密钥"
 
-#: agent/gpg-agent.c:129
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "为所选用户标识的设定注记"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "导入后不更新信任度数据库"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:172
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 tools/symcryptrun.c:204
 #, fuzzy
@@ -337,142 +372,142 @@ msgstr ""
 "请向 <gnupg-bugs@gnu.org> 报告程序缺陷。\n"
 "请向 <zuxyhere@eastday.com> 反映简体中文翻译的问题。\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:276
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: agent/gpg-agent.c:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意：没有默认配置文件‘%s’\n"
 
-#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 
-#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "已创建目录‘%s’\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) 在 %s 中出错：%s\n"
 
-#: agent/gpg-agent.c:1381
+#: agent/gpg-agent.c:1438
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1549
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1554
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1571
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1519
+#: agent/gpg-agent.c:1576
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "更新私钥失败：%s\n"
 
-#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s：已跳过：%s\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
 
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -500,40 +535,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/protect-tool.c:1190
+#: agent/protect-tool.c:1213
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "错误的密码"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "已取消"
@@ -585,8 +620,8 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -596,7 +631,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr ""
 
@@ -608,58 +643,79 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 #, fuzzy
 msgid "Yes"
 msgstr "yes"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr ""
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+
+#: agent/findkey.c:188 agent/findkey.c:195
+#, fuzzy
+msgid "Change passphrase"
+msgstr "更改密码"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr ""
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "无法打开有签名的数据‘%s’\n"
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "读取‘%s’时出错：%s\n"
@@ -701,17 +757,17 @@ msgstr "用户取消\n"
 msgid "problem with the agent\n"
 msgstr "代理程序有问题――正在停用代理程序\n"
 
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "无法禁用核心内存转储：%s\n"
 
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "警告：扩展模块‘%s’所有权不安全\n"
 
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "警告：扩展模块‘%s’权限不安全\n"
@@ -1446,7 +1502,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:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1578,7 +1634,7 @@ msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1613,7 +1669,7 @@ msgstr "使用标准的文本模式"
 msgid "use as output file"
 msgstr "指定输出文件"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "不做任何改变"
 
@@ -2606,12 +2662,12 @@ msgstr "  已跳过的新密钥：%lu\n"
 msgid "          w/o user IDs: %lu\n"
 msgstr "    遗失用户标识：%lu\n"
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "          已导入：%lu"
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          未改变：%lu\n"
@@ -2636,22 +2692,22 @@ msgstr "        新的签名：%lu\n"
 msgid "   new key revocations: %lu\n"
 msgstr "    新的密钥吊销：%lu\n"
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      读取的私钥：%lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "      导入的私钥：%lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    未改变的私钥：%lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        未被导入：%lu\n"
@@ -3744,12 +3800,12 @@ msgid ""
 msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
 
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "已吊销"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "已过期"
 
@@ -3807,7 +3863,7 @@ msgstr "已经删除了 %d 个签名。\n"
 msgid "Nothing deleted.\n"
 msgstr "没有东西被删除。\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "无效"
 
@@ -4947,7 +5003,7 @@ msgstr "二进制"
 msgid "textmode"
 msgstr "文本模式"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 msgid "unknown"
 msgstr "未知"
 
@@ -5008,65 +5064,65 @@ msgstr "警告：使用试验性质的散列算法 %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "警告：不建议使用散列算法 %s\n"
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 算法插件不存在\n"
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "请参见 %s 以得到更多信息。\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d：不建议使用该选项“%s”\n"
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告：“%s”选项已不建议使用\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "请以“%s%s”代替\n"
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "警告：“%s”命令已不建议使用——不要使用它\n"
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "警告：“%s”选项已不建议使用\n"
 
-#: g10/misc.c:737
+#: g10/misc.c:739
 msgid "Uncompressed"
 msgstr "不压缩"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 msgid "uncompressed|none"
 msgstr "未压缩|无"
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "%s 也许不能使用这个报文\n"
 
-#: g10/misc.c:1047
+#: g10/misc.c:1049
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "有歧义的选项‘%s’\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "未知的选项 '%s'\n"
@@ -5860,7 +5916,7 @@ msgstr "已跳过：私钥已存在\n"
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "这是一把由 PGP 生成的 ElGamal 密钥，用于签名不安全！"
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "信任记录 %lu，类别 %d：写入失败：%s\n"
@@ -5905,7 +5961,7 @@ msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 msgid "read error in `%s': %s\n"
 msgstr "读取‘%s’错误：%s\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任度数据库：同步失败：%s\n"
@@ -6048,162 +6104,162 @@ msgstr "无法处理长于 %d 字符的文本行\n"
 msgid "input line longer than %d characters\n"
 msgstr "输入行长度超过 %d 字符\n"
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "‘%s’不是一个有效的长式钥匙号\n"
 
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "密钥 %s：受信任，已接受\n"
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "密钥 %s 在信任度数据库中重复出现\n"
 
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "密钥 %s：受信任的密钥没有公钥――已跳过\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "密钥 %s 被标记为绝对信任\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "信任记录 %lu，请求类别 %d：读取失败：%s\n"
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "信任记录 %lu 不属于所请求的类别 %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "无法使用未知的信任模型(%d)――假定使用 %s 信任模型\n"
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr "使用 %s 信任模型\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "10 translator see trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 msgid "[ revoked]"
 msgstr "[已吊销]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 msgid "[ expired]"
 msgstr "[已过期]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 msgid "[ unknown]"
 msgstr "[ 未知 ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr "[未定义]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr "[ 勉强 ]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr "[ 完全 ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr "[ 绝对 ]"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr "未定义"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 msgid "never"
 msgstr "从不"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr "勉强"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr "完全"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr "绝对"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr "不需要检查信任度数据库\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任度数据库检查将于 %s 进行\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "使用‘%s’信任模型时不需要检查信任度数据库\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "使用‘%s’信任模型时不需要更新信任度数据库\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "找不到公钥 %s：%s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr "请执行一次 --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 msgid "checking the trustdb\n"
 msgstr "正在检查信任度数据库\n"
 
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 msgid "no ultimately trusted keys found\n"
 msgstr "没有找到任何绝对信任的密钥\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "绝对信任的密钥 %s 的公钥未被找到\n"
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "需要 %d 份勉强信任和 %d 份完全信任，%s 信任模型\n"
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "深度：%d 有效性：%3d 已签名：%3d 信任度：%d-，%dq，%dn，%dm，%df，%du\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "无法更新信任度数据库版本记录：写入失败：%s\n"
@@ -6253,27 +6309,27 @@ msgstr "签名时失败： %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "将‘%s’重命名为‘%s’时失败：%s\n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 #, fuzzy
 msgid "Please report bugs to "
 msgstr ""
 "请向 <gnupg-bugs@gnu.org> 报告程序缺陷。\n"
 "请向 <zuxyhere@eastday.com> 反映简体中文翻译的问题。\n"
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -6746,7 +6802,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "检查已建立的签名时发生错误： %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
@@ -6961,16 +7017,6 @@ msgstr "删除密钥区块时失败：%s\n"
 msgid "no valid recipients given\n"
 msgstr "(不给定描述)\n"
 
-#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "生成密码的时候发生错误：%s\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "%s：写入目录记录时出错：%s\n"
-
 #: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
@@ -7113,7 +7159,7 @@ msgstr "从这个钥匙环里取用密钥"
 msgid "add this secret keyring to the list"
 msgstr "要有私钥才能这么做。\n"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
@@ -7198,26 +7244,26 @@ msgstr "无法存取‘%s’：%s\n"
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "合计被处理的数量：%lu\n"
 
-#: sm/import.c:226
+#: sm/import.c:227
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "生成一份吊销证书"
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
@@ -7429,27 +7475,27 @@ msgstr "读取‘%s’时出错：%s\n"
 msgid "error sending standard options: %s\n"
 msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr ""
 
@@ -7465,56 +7511,82 @@ msgstr ""
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:521
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: tools/gpgconf-comp.c:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:533
+#, fuzzy
+msgid "|N|expire the passphrase after N days"
+msgstr "从导出的子钥中删除所有密码"
+
+#: tools/gpgconf-comp.c:537
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "生成密码的时候发生错误：%s\n"
+
+#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: tools/gpgconf-comp.c:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 236806c72..cc14bba4b 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-08-16 11:04+0200\n"
+"POT-Creation-Date: 2007-08-28 19:28+0200\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"
@@ -22,54 +22,54 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "存放指紋失敗: %s\n"
 
-#: agent/call-pinentry.c:436
+#: agent/call-pinentry.c:438
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:439
+#: agent/call-pinentry.c:441
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: agent/call-pinentry.c:486
+#: agent/call-pinentry.c:489
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:506 agent/call-pinentry.c:518
+#: agent/call-pinentry.c:509 agent/call-pinentry.c:521
 #, fuzzy
 msgid "PIN too long"
 msgstr "列太長"
 
-#: agent/call-pinentry.c:507
+#: agent/call-pinentry.c:510
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "列太長"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:518
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "姓名含有無效的字符\n"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:523
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:532
+#: agent/call-pinentry.c:535
 #, fuzzy
 msgid "Bad PIN"
 msgstr "損壞的 MPI"
 
-#: agent/call-pinentry.c:533
+#: agent/call-pinentry.c:536
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "錯誤的密語"
 
-#: agent/call-pinentry.c:569
+#: agent/call-pinentry.c:572
 #, fuzzy
 msgid "Passphrase"
 msgstr "錯誤的密語"
@@ -164,7 +164,28 @@ msgstr "個人識別碼 (PIN) 再次輸入時沒有正確重複; 請再試一次
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
 
-#: agent/genkey.c:88
+#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
+#: sm/import.c:550
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "建立密語的時候發生錯誤: %s\n"
+
+#: agent/genkey.c:113 sm/export.c:635 sm/import.c:533
+#, fuzzy, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "%s: 寫入目錄記錄時錯誤: %s\n"
+
+#: agent/genkey.c:151 agent/genkey.c:157
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "請輸入密語\n"
+
+#: agent/genkey.c:165
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "無論如何還是使用這把金鑰嗎? (y/N) "
+
+#: agent/genkey.c:185
 #, c-format
 msgid ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
@@ -175,50 +196,64 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:98
-#, fuzzy
-msgid "Take this one anyway"
-msgstr "無論如何還是使用這把金鑰嗎? (y/N) "
+#: agent/genkey.c:202
+#, 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."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Acontain at least %u digits or special characters."
+msgstr[0] ""
+msgstr[1] ""
 
-#: agent/genkey.c:99 agent/genkey.c:114
-#, fuzzy
-msgid "Enter new passphrase"
-msgstr "請輸入密語\n"
+#: agent/genkey.c:225
+#, 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 ""
 
-#: agent/genkey.c:107
+#: agent/genkey.c:238
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+
+#: agent/genkey.c:240
 #, 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:113
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:158
+#: agent/genkey.c:290
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "妳需要一個密語來保護妳的私鑰.\n"
 "\n"
 
-#: agent/genkey.c:160 agent/genkey.c:281 agent/protect-tool.c:1196
+#: agent/genkey.c:292 agent/genkey.c:413 agent/protect-tool.c:1219
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "更改密語"
 
-#: agent/genkey.c:189 agent/genkey.c:311 agent/protect-tool.c:1202
+#: 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:280
+#: agent/genkey.c:412
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "更改密語"
 
-#: agent/gpg-agent.c:112 agent/preset-passphrase.c:72 agent/protect-tool.c:109
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
 #: scd/scdaemon.c:104
 #, fuzzy
 msgid ""
@@ -229,246 +264,246 @@ msgstr ""
 "選項:\n"
 " "
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:106
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:109
+#: agent/gpg-agent.c:121 scd/scdaemon.c:109
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 g10/gpg.c:469 g10/gpgv.c:70 kbx/kbxutil.c:80
+#: 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:67 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "囉唆模式"
 
-#: agent/gpg-agent.c:117 g10/gpgv.c:71 kbx/kbxutil.c:81 scd/scdaemon.c:111
+#: agent/gpg-agent.c:123 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:111
 #: sm/gpgsm.c:341
 msgid "be somewhat more quiet"
 msgstr "盡量安靜些"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:124 scd/scdaemon.c:112
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:113
+#: agent/gpg-agent.c:125 scd/scdaemon.c:113
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:126 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "從 `%s' 讀取選項\n"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:122
+#: agent/gpg-agent.c:131 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:126
+#: agent/gpg-agent.c:132
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:127 scd/scdaemon.c:123 sm/gpgsm.c:343
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123 sm/gpgsm.c:343
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "在某個金鑰伺服器上搜尋金鑰"
 
-#: agent/gpg-agent.c:129
+#: agent/gpg-agent.c:135
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "設定所選使用者 ID 的偏好清單"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:141
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:136
+#: agent/gpg-agent.c:142
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "更新信任資料庫"
 
-#: agent/gpg-agent.c:143
+#: agent/gpg-agent.c:150
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:152
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:148
+#: agent/gpg-agent.c:155
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:168
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:170
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:172
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:173
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:175
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:257 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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:89 tools/symcryptrun.c:204
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "請向 <gnupg-bugs@gnu.org> 回報程式瑕疵.\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:276
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: agent/gpg-agent.c:262
+#: agent/gpg-agent.c:278
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:297 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
+#: agent/gpg-agent.c:313 g10/gpg.c:916 scd/scdaemon.c:246 sm/gpgsm.c:679
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:476 agent/protect-tool.c:1043 kbx/kbxutil.c:419
+#: 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
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:569 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
+#: agent/gpg-agent.c:605 g10/gpg.c:2023 scd/scdaemon.c:416 sm/gpgsm.c:910
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
-#: agent/gpg-agent.c:574 agent/gpg-agent.c:1120 g10/gpg.c:2027
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: agent/gpg-agent.c:582 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
+#: agent/gpg-agent.c:618 g10/gpg.c:2034 scd/scdaemon.c:429 sm/gpgsm.c:921
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項\n"
 
-#: agent/gpg-agent.c:890 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:947 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:1190 agent/gpg-agent.c:1316 agent/gpg-agent.c:1320
-#: agent/gpg-agent.c:1361 agent/gpg-agent.c:1365 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "無法建立目錄 `%s': %s\n"
 
-#: agent/gpg-agent.c:1204 scd/scdaemon.c:922
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:922
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1230 scd/scdaemon.c:948
+#: agent/gpg-agent.c:1287 scd/scdaemon.c:948
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "無法建立 `%s': %s\n"
 
-#: agent/gpg-agent.c:1248 agent/gpg-agent.c:1264
+#: agent/gpg-agent.c:1305 agent/gpg-agent.c:1321
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent 在此階段無法使用\n"
 
-#: agent/gpg-agent.c:1278 scd/scdaemon.c:977
+#: agent/gpg-agent.c:1335 scd/scdaemon.c:977
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
 
-#: agent/gpg-agent.c:1290 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:985
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: agent/gpg-agent.c:1296 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1353 scd/scdaemon.c:991
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "正在將私鑰寫至 `%s'\n"
 
-#: agent/gpg-agent.c:1324 agent/gpg-agent.c:1371 g10/openfile.c:432
+#: agent/gpg-agent.c:1381 agent/gpg-agent.c:1428 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "目錄 `%s' 已建立\n"
 
-#: agent/gpg-agent.c:1377
+#: agent/gpg-agent.c:1434
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) 失敗於 %s: %s\n"
 
-#: agent/gpg-agent.c:1381
+#: agent/gpg-agent.c:1438
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "無法建立目錄 `%s': %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1549
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1554
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1514
+#: agent/gpg-agent.c:1571
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1519
+#: agent/gpg-agent.c:1576
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1623 scd/scdaemon.c:1117
+#: agent/gpg-agent.c:1680 scd/scdaemon.c:1117
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "更新私鑰失敗: %s\n"
 
-#: agent/gpg-agent.c:1729 scd/scdaemon.c:1184
+#: agent/gpg-agent.c:1786 scd/scdaemon.c:1184
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: 已跳過: %s\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1809
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent 在此階段無法使用\n"
 
-#: agent/gpg-agent.c:1763 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1820 common/simple-pwquery.c:329
 #: tools/gpg-connect-agent.c:756
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "被變造的 GPG_AGENT_INFO 環境變數\n"
 
-#: agent/gpg-agent.c:1776 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1833 common/simple-pwquery.c:341
 #: tools/gpg-connect-agent.c:767
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -496,40 +531,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1187
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: agent/protect-tool.c:1190
+#: agent/protect-tool.c:1213
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1216
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1221
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: agent/protect-tool.c:1203 tools/symcryptrun.c:457
+#: agent/protect-tool.c:1226 tools/symcryptrun.c:457
 #, fuzzy
 msgid "Passphrase:"
 msgstr "錯誤的密語"
 
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:471
+#: agent/protect-tool.c:1240 tools/symcryptrun.c:471
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:475
+#: agent/protect-tool.c:1243 tools/symcryptrun.c:475
 #, fuzzy
 msgid "cancelled\n"
 msgstr "已取消"
@@ -581,8 +616,8 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
-#. the name as store in the certificate.
-#: agent/trustlist.c:507
+#. the name as stored in the certificate.
+#: agent/trustlist.c:539
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -592,7 +627,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:516
+#: agent/trustlist.c:551
 msgid "Correct"
 msgstr ""
 
@@ -604,58 +639,79 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:536
+#: agent/trustlist.c:574
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 #, fuzzy
 msgid "Yes"
 msgstr "yes"
 
-#: agent/trustlist.c:542
+#: agent/trustlist.c:583
 msgid "No"
 msgstr ""
 
-#: common/exechelp.c:302 common/exechelp.c:390
+#: agent/findkey.c:158
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr ""
+
+#: agent/findkey.c:174
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
+msgstr ""
+
+#: agent/findkey.c:188 agent/findkey.c:195
+#, fuzzy
+msgid "Change passphrase"
+msgstr "更改密語"
+
+#: agent/findkey.c:196
+msgid "I'll change it later"
+msgstr ""
+
+#: common/exechelp.c:327 common/exechelp.c:415
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: common/exechelp.c:366 common/exechelp.c:423
+#: common/exechelp.c:391 common/exechelp.c:448
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "無法開啟被簽署過的資料 `%s'\n"
 
-#: common/exechelp.c:402 common/exechelp.c:632
+#: common/exechelp.c:427 common/exechelp.c:555 common/exechelp.c:771
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: common/exechelp.c:458 common/exechelp.c:501
+#: common/exechelp.c:596 common/exechelp.c:640
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:466
+#: common/exechelp.c:604
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "取得現用金鑰資訊時發生錯誤: %s\n"
 
-#: common/exechelp.c:472 common/exechelp.c:512
+#: common/exechelp.c:610 common/exechelp.c:651
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
 
-#: common/exechelp.c:507
+#: common/exechelp.c:646
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:518
+#: common/exechelp.c:657
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
@@ -697,17 +753,17 @@ msgstr "由使用者取消了\n"
 msgid "problem with the agent\n"
 msgstr "代理程式的問題 - 正在停用代理程式\n"
 
-#: common/sysutils.c:99
+#: common/sysutils.c:103
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "無法讓系統停止傾印核心檔: %s\n"
 
-#: common/sysutils.c:194
+#: common/sysutils.c:198
 #, fuzzy, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "警告: 延伸模組 `%s' 的所有權並不安全\n"
 
-#: common/sysutils.c:226
+#: common/sysutils.c:230
 #, fuzzy, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "警告: 延伸模組 `%s' 的權限並不安全\n"
@@ -1445,7 +1501,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:67 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:368 kbx/kbxutil.c:71 sm/gpgsm.c:242 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1577,7 +1633,7 @@ msgstr "|演算法 [檔案]|印出訊息摘要"
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:432 g10/gpgv.c:68 kbx/kbxutil.c:75 sm/gpgsm.c:279
+#: 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:64 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1612,7 +1668,7 @@ msgstr "使用標準的文字模式"
 msgid "use as output file"
 msgstr "當作輸出檔案來使用"
 
-#: g10/gpg.c:480 kbx/kbxutil.c:82 sm/gpgsm.c:349 tools/gpgconf.c:69
+#: g10/gpg.c:480 kbx/kbxutil.c:90 sm/gpgsm.c:349 tools/gpgconf.c:69
 msgid "do not make any changes"
 msgstr "不要做任何改變"
 
@@ -2625,12 +2681,12 @@ msgstr "        已跳過的新金鑰: %lu\n"
 msgid "          w/o user IDs: %lu\n"
 msgstr "       沒有使用者的 ID: %lu\n"
 
-#: g10/import.c:302 sm/import.c:111
+#: g10/import.c:302 sm/import.c:112
 #, c-format
 msgid "              imported: %lu"
 msgstr "                已匯入: %lu"
 
-#: g10/import.c:308 sm/import.c:115
+#: g10/import.c:308 sm/import.c:116
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              未改變的: %lu\n"
@@ -2655,22 +2711,22 @@ msgstr "              新的簽章: %lu\n"
 msgid "   new key revocations: %lu\n"
 msgstr "          新的金鑰撤銷: %lu\n"
 
-#: g10/import.c:318 sm/import.c:117
+#: g10/import.c:318 sm/import.c:118
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "          被讀取的私鑰: %lu\n"
 
-#: g10/import.c:320 sm/import.c:119
+#: g10/import.c:320 sm/import.c:120
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "          已匯入的私鑰: %lu\n"
 
-#: g10/import.c:322 sm/import.c:121
+#: g10/import.c:322 sm/import.c:122
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "          未改變的私鑰: %lu\n"
 
-#: g10/import.c:324 sm/import.c:123
+#: g10/import.c:324 sm/import.c:124
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              未被匯入: %lu\n"
@@ -3777,12 +3833,12 @@ msgstr ""
 "除非妳重新執行程式.\n"
 
 #: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "已撤銷"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "已過期"
 
@@ -3841,7 +3897,7 @@ msgstr "已經刪除了 %d 個簽章.\n"
 msgid "Nothing deleted.\n"
 msgstr "沒有東西被刪除.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1701
+#: g10/keyedit.c:3242 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "無效"
 
@@ -4983,7 +5039,7 @@ msgstr "二進制"
 msgid "textmode"
 msgstr "文字模式"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:529
+#: g10/mainproc.c:1936 g10/trustdb.c:525
 msgid "unknown"
 msgstr "未知"
 
@@ -5044,65 +5100,65 @@ msgstr "警告: 正在使用實驗性的摘要演算法 %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "警告: 摘要演算法 %s 已不建議使用\n"
 
-#: g10/misc.c:414
+#: g10/misc.c:416
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 編密法外掛模組不存在\n"
 
-#: g10/misc.c:415 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "請參考 http://www.gnupg.org/faq.html 上進一步的資訊\n"
 
-#: g10/misc.c:650
+#: g10/misc.c:652
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: 不建議使用的選項 \"%s\"\n"
 
-#: g10/misc.c:654
+#: g10/misc.c:656
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告: \"%s\" 選項已不建議使用\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:658
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "請改以 \"%s%s\" 代替\n"
 
-#: g10/misc.c:663
+#: g10/misc.c:665
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "警告: \"%s\" 是個被反對使用的指令 - 別再用了\n"
 
-#: g10/misc.c:673
+#: g10/misc.c:675
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:676
+#: g10/misc.c:678
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "警告: \"%s\" 選項已不建議使用\n"
 
-#: g10/misc.c:737
+#: g10/misc.c:739
 msgid "Uncompressed"
 msgstr "未被壓縮"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:762
+#: g10/misc.c:764
 msgid "uncompressed|none"
 msgstr "uncompressed|none|未被壓縮|無"
 
-#: g10/misc.c:872
+#: g10/misc.c:874
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "這個訊息對 %s 來說無法使用\n"
 
-#: g10/misc.c:1047
+#: g10/misc.c:1049
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "不明確的選項 `%s'\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1074
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "未知的選項 `%s'\n"
@@ -5903,7 +5959,7 @@ msgstr "已跳過: 私鑰已經存在\n"
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "這是由 PGP 產生的 ElGamal 金鑰, 用於簽章並不安全!"
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "信任記錄 %lu, 類別 %d: 寫入失敗: %s\n"
@@ -5948,7 +6004,7 @@ msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
 msgid "read error in `%s': %s\n"
 msgstr "讀取 `%s' 錯誤: %s\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任資料庫: 同步化失敗: %s\n"
@@ -6091,161 +6147,161 @@ msgstr "無法處理長於 %d 字符的文字列\n"
 msgid "input line longer than %d characters\n"
 msgstr "輸入列比 %d 字符還長\n"
 
-#: g10/trustdb.c:225
+#: g10/trustdb.c:221
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' 不是一個有效的長式金鑰 ID\n"
 
-#: g10/trustdb.c:256
+#: g10/trustdb.c:252
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "金鑰 %s: 如受信任的金鑰般被接受了\n"
 
-#: g10/trustdb.c:294
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "金鑰 %s 在信任資料庫中出現了不止一次\n"
 
-#: g10/trustdb.c:309
+#: g10/trustdb.c:305
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "金鑰 %s: 受信任的金鑰沒有公鑰 - 已跳過\n"
 
-#: g10/trustdb.c:319
+#: g10/trustdb.c:315
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "金鑰 %s 已被標記成徹底信任了\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:339
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "信任記錄 %lu, 請求類別 %d: 讀取失敗: %s\n"
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "信任記錄 %lu 不是所請求的類別 %d\n"
 
-#: g10/trustdb.c:445
+#: g10/trustdb.c:441
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "無法使用未知的信任模型 (%d) - 現在採用 %s 信任模型\n"
 
-#: g10/trustdb.c:451
+#: g10/trustdb.c:447
 #, c-format
 msgid "using %s trust model\n"
 msgstr "正在使用 %s 信任模型\n"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:499
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "10 譯者請參見 trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:501
 msgid "[ revoked]"
 msgstr "[ 已撤銷 ]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:503 g10/trustdb.c:508
 msgid "[ expired]"
 msgstr "[ 已過期 ]"
 
-#: g10/trustdb.c:511
+#: g10/trustdb.c:507
 msgid "[ unknown]"
 msgstr "[  未知  ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:509
 msgid "[  undef ]"
 msgstr "[ 未定義 ]"
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:510
 msgid "[marginal]"
 msgstr "[  勉強  ]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:511
 msgid "[  full  ]"
 msgstr "[  完全  ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:512
 msgid "[ultimate]"
 msgstr "[  徹底  ]"
 
-#: g10/trustdb.c:531
+#: g10/trustdb.c:527
 msgid "undefined"
 msgstr "未定義"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:528
 msgid "never"
 msgstr "永遠不會"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:529
 msgid "marginal"
 msgstr "勉強"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:530
 msgid "full"
 msgstr "完全"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:531
 msgid "ultimate"
 msgstr "徹底"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:571
 msgid "no need for a trustdb check\n"
 msgstr "不需要檢查信任資料庫\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2350
+#: g10/trustdb.c:577 g10/trustdb.c:2346
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任資料庫檢查將於 %s 進行\n"
 
-#: g10/trustdb.c:590
+#: g10/trustdb.c:586
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "在 `%s' 信任模型中並不需要檢查信任資料庫\n"
 
-#: g10/trustdb.c:605
+#: g10/trustdb.c:601
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "在 `%s' 信任模型中並不需要更新信任資料庫\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:833 g10/trustdb.c:1271
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "找不到公鑰 %s: %s\n"
 
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1028
 msgid "please do a --check-trustdb\n"
 msgstr "請做一次 --check-trustdb\n"
 
-#: g10/trustdb.c:1036
+#: g10/trustdb.c:1032
 msgid "checking the trustdb\n"
 msgstr "正在檢查信任資料庫\n"
 
-#: g10/trustdb.c:2093
+#: g10/trustdb.c:2089
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "已經處理了 %d 把金鑰 (共計已解決了 %d 份有效性)\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2154
 msgid "no ultimately trusted keys found\n"
 msgstr "沒有找到任何徹底信任的金鑰\n"
 
-#: g10/trustdb.c:2172
+#: g10/trustdb.c:2168
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "徹底信任金鑰 %s 的公鑰沒有被找到\n"
 
-#: g10/trustdb.c:2195
+#: g10/trustdb.c:2191
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d 個勉強信任以及 %d 個完全信任是 %s 信任模型的最小需求\n"
 
-#: g10/trustdb.c:2281
+#: g10/trustdb.c:2277
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr "深度: %d  有效: %3d  已簽署: %3d  信任: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2352
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
@@ -6295,25 +6351,25 @@ msgstr "簽署時失敗了: %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "把 `%s' 重新新命成 `%s' 時失敗: %s\n"
 
-#: kbx/kbxutil.c:84
+#: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
 
-#: kbx/kbxutil.c:85
+#: kbx/kbxutil.c:93
 msgid "enable full debugging"
 msgstr ""
 
-#: kbx/kbxutil.c:106
+#: kbx/kbxutil.c:114
 #, fuzzy
 msgid "Please report bugs to "
 msgstr "請向 <gnupg-bugs@gnu.org> 回報程式瑕疵.\n"
 
-#: kbx/kbxutil.c:110
+#: kbx/kbxutil.c:118
 #, fuzzy
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: kbx/kbxutil.c:113
+#: kbx/kbxutil.c:121
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -6786,7 +6842,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "檢查已建立的簽章時發生錯誤: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:157
+#: sm/certchain.c:1295 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
@@ -7001,16 +7057,6 @@ msgstr "刪除金鑰區塊時失敗了: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(沒有給定描述)\n"
 
-#: sm/export.c:613 sm/export.c:629 sm/import.c:524 sm/import.c:549
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "建立密語的時候發生錯誤: %s\n"
-
-#: sm/export.c:620 sm/import.c:532
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "%s: 寫入目錄記錄時錯誤: %s\n"
-
 #: sm/gpgsm.c:244
 #, fuzzy
 msgid "|[FILE]|make a signature"
@@ -7153,7 +7199,7 @@ msgstr "從這個鑰匙圈裡取用金鑰"
 msgid "add this secret keyring to the list"
 msgstr "要有私鑰纔能這麼做.\n"
 
-#: sm/gpgsm.c:358 tools/gpgconf-comp.c:611 tools/gpgconf-comp.c:673
+#: sm/gpgsm.c:358 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:697
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
@@ -7238,26 +7284,26 @@ msgstr "無法存取 `%s': %s\n"
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/import.c:108
+#: sm/import.c:109
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
 msgstr "總共被處理的數量: %lu\n"
 
-#: sm/import.c:226
+#: sm/import.c:227
 #, fuzzy
 msgid "error storing certificate\n"
 msgstr "產生一份撤銷憑證"
 
-#: sm/import.c:234
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:420 sm/import.c:452
+#: sm/import.c:421 sm/import.c:453
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: sm/import.c:541 tools/gpg-connect-agent.c:374
+#: sm/import.c:542 tools/gpg-connect-agent.c:374
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
@@ -7469,27 +7515,27 @@ msgstr "讀取 `%s' 時發生錯誤: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
 
-#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:529 tools/gpgconf-comp.c:596
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:449 tools/gpgconf-comp.c:553 tools/gpgconf-comp.c:620
+#: tools/gpgconf-comp.c:682 tools/gpgconf-comp.c:763
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:609
-#: tools/gpgconf-comp.c:671 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:462 tools/gpgconf-comp.c:566 tools/gpgconf-comp.c:633
+#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:786
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:567 tools/gpgconf-comp.c:622
-#: tools/gpgconf-comp.c:690 tools/gpgconf-comp.c:769
+#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:591 tools/gpgconf-comp.c:646
+#: tools/gpgconf-comp.c:714 tools/gpgconf-comp.c:793
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:572 tools/gpgconf-comp.c:627
-#: tools/gpgconf-comp.c:695 tools/gpgconf-comp.c:777
+#: tools/gpgconf-comp.c:477 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:651
+#: tools/gpgconf-comp.c:719 tools/gpgconf-comp.c:801
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:703
+#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:601 tools/gpgconf-comp.c:727
 msgid "Options controlling the security"
 msgstr ""
 
@@ -7505,56 +7551,82 @@ msgstr ""
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:514
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:517
+msgid "do not allow to bypass the passphrase policy"
+msgstr ""
+
+#: tools/gpgconf-comp.c:521
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:676
+#: tools/gpgconf-comp.c:525
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: tools/gpgconf-comp.c:529
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: tools/gpgconf-comp.c:533
+#, fuzzy
+msgid "|N|expire the passphrase after N days"
+msgstr "撤銷金鑰或所選的次鑰"
+
+#: tools/gpgconf-comp.c:537
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "建立密語的時候發生錯誤: %s\n"
+
+#: tools/gpgconf-comp.c:638 tools/gpgconf-comp.c:700
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|名字|以「名字」作為加密對象"
 
-#: tools/gpgconf-comp.c:635
+#: tools/gpgconf-comp.c:659
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:640
+#: tools/gpgconf-comp.c:664
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:709
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:708
+#: tools/gpgconf-comp.c:732
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:752
+#: tools/gpgconf-comp.c:776
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:788
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:822
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:809
+#: tools/gpgconf-comp.c:833
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:838
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:851
+#: tools/gpgconf-comp.c:875
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2684
+#: tools/gpgconf-comp.c:2706
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 552ef92cd..dd4f12d87 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-28  Werner Koch  <wk@g10code.com>
+
+	* gpgconf-comp.c <gpg-agent>: Add options --max-passphrase-days
+	and --enable-passphrase-history.
+
 2007-08-27  Werner Koch  <wk@g10code.com>
 
 	* gpg-check-pattern.c: New
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 466da32bd..e2c03d4f8 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -528,6 +528,14 @@ static gc_option_t gc_options_gpg_agent[] =
      GC_LEVEL_EXPERT,
      "gnupg", N_("|FILE|check new passphrases against pattern in FILE"),
      GC_ARG_TYPE_PATHNAME, GC_BACKEND_SCDAEMON },
+   { "max-passphrase-days", GC_OPT_FLAG_RUNTIME,
+     GC_LEVEL_EXPERT, "gnupg", 
+     N_("|N|expire the passphrase after N days"),
+     GC_ARG_TYPE_UINT32, GC_BACKEND_GPG_AGENT },
+   { "enable-passphrases-history", GC_OPT_FLAG_RUNTIME, 
+     GC_LEVEL_EXPERT, "gnupg", 
+     N_("do not allow the reuse of old passphrases"),
+     GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
 
    GC_OPTION_NULL
  };